From 207d0a520bdbbd74031258324d3c8e484d2a8d57 Mon Sep 17 00:00:00 2001 From: Nadia Holmquist Pedersen Date: Wed, 4 May 2022 15:08:37 +0200 Subject: [PATCH] use built-in CMake version properties --- CMakeLists.txt | 21 ++++++--------------- res/melon.plist.in | 4 ++-- res/melon.rc.in | 8 ++++---- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31f37648..944968c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,33 +9,24 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) -project(melonDS C CXX) +project(melonDS + VERSION 0.9.4 + DESCRIPTION "DS emulator, sorta" + HOMEPAGE_URL "https://melonds.kuribo64.net" + LANGUAGES C CXX) include(CheckSymbolExists) include(CheckLibraryExists) include(CMakeDependentOption) include(CheckIPOSupported) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version") set(CMAKE_C_STANDARD 11) set(CMAKE_CXX_STANDARD 17) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -set(MELONDS_VERSION "0.9.4") -add_compile_definitions(MELONDS_VERSION="${MELONDS_VERSION}") -string(REPLACE "." ";" VERSION_LIST ${MELONDS_VERSION}) -# For the melon.rc file used on Windows -list(GET VERSION_LIST 0 MELONDS_VERSION_MAJOR) -list(GET VERSION_LIST 1 MELONDS_VERSION_MINOR) -# Check if melonDS version is three digits or two digits -list(LENGTH VERSION_LIST MELONDS_VER_LEN) -if (${MELONDS_VER_LEN} GREATER 2) - list(GET VERSION_LIST 2 MELONDS_VERSION_PATCH) -else() - set(MELONDS_VERSION_PATCH 0) -endif() +add_compile_definitions(MELONDS_VERSION="${melonDS_VERSION}") if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE) diff --git a/res/melon.plist.in b/res/melon.plist.in index 1057c474..20d385a0 100644 --- a/res/melon.plist.in +++ b/res/melon.plist.in @@ -13,9 +13,9 @@ CFBundlePackageType APPL CFBundleVersion - ${MELONDS_VERSION} + ${melonDS_VERSION} CFBundleShortVersionString - ${MELONDS_VERSION} + ${melonDS_VERSION} NSHumanReadableCopyright Licensed under GPLv3 NSHighResolutionCapable diff --git a/res/melon.rc.in b/res/melon.rc.in index 3851813c..27c7cbdf 100644 --- a/res/melon.rc.in +++ b/res/melon.rc.in @@ -6,8 +6,8 @@ //include version information in .exe, modify these values to match your needs 1 VERSIONINFO -FILEVERSION ${MELONDS_VERSION_MAJOR},${MELONDS_VERSION_MINOR},${MELONDS_VERSION_PATCH},0 -PRODUCTVERSION ${MELONDS_VERSION_MAJOR},${MELONDS_VERSION_MINOR},${MELONDS_VERSION_PATCH},0 +FILEVERSION ${melonDS_VERSION_MAJOR},${melonDS_VERSION_MINOR},${melonDS_VERSION_PATCH},0 +PRODUCTVERSION ${melonDS_VERSION_MAJOR},${melonDS_VERSION_MINOR},${melonDS_VERSION_PATCH},0 FILETYPE VFT_APP { BLOCK "StringFileInfo" @@ -15,14 +15,14 @@ FILETYPE VFT_APP BLOCK "040904E4" { VALUE "CompanyName", "Melon Factory of Kuribo64" - VALUE "FileVersion", "${MELONDS_VERSION}" + VALUE "FileVersion", "${melonDS_VERSION}" VALUE "FileDescription", "melonDS emulator" VALUE "InternalName", "SDnolem" VALUE "LegalCopyright", "2016-2022 melonDS team" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "zafkflzdasd.exe" VALUE "ProductName", "melonDS" - VALUE "ProductVersion", "${MELONDS_VERSION}" + VALUE "ProductVersion", "${melonDS_VERSION}" } } BLOCK "VarFileInfo"