From 4a3277e6d0fca5217ce233b6beeaa95e4bdb3525 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 9 Jan 2022 21:26:51 -0800 Subject: [PATCH] Fix version info --- metaforce-gui/CMakeLists.txt | 4 +++- metaforce-gui/platforms/mac/{Info.plist => Info.plist.in} | 0 .../platforms/win/{metaforce-gui.rc => metaforce-gui.rc.in} | 0 version.h.in | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) rename metaforce-gui/platforms/mac/{Info.plist => Info.plist.in} (100%) rename metaforce-gui/platforms/win/{metaforce-gui.rc => metaforce-gui.rc.in} (100%) diff --git a/metaforce-gui/CMakeLists.txt b/metaforce-gui/CMakeLists.txt index 46a0747f2..dfd3353e7 100644 --- a/metaforce-gui/CMakeLists.txt +++ b/metaforce-gui/CMakeLists.txt @@ -131,13 +131,15 @@ elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") endif () if (WIN32) + configure_file(platforms/win/metaforce.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/metaforce.rc" @ONLY) target_sources(metaforce-gui PRIVATE platforms/win/metaforce-gui.manifest platforms/win/metaforce-gui.rc ) elseif (APPLE) + configure_file(platforms/mac/Info.plist.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/mac/Info.plist" @ONLY) set_target_properties(metaforce-gui PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/platforms/mac/Info.plist" + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/metaforce-gui/platforms/mac/Info.plist" ) target_sources(metaforce-gui PRIVATE platforms/mac/mainicon.icns) set_source_files_properties(platforms/mac/mainicon.icns PROPERTIES diff --git a/metaforce-gui/platforms/mac/Info.plist b/metaforce-gui/platforms/mac/Info.plist.in similarity index 100% rename from metaforce-gui/platforms/mac/Info.plist rename to metaforce-gui/platforms/mac/Info.plist.in diff --git a/metaforce-gui/platforms/win/metaforce-gui.rc b/metaforce-gui/platforms/win/metaforce-gui.rc.in similarity index 100% rename from metaforce-gui/platforms/win/metaforce-gui.rc rename to metaforce-gui/platforms/win/metaforce-gui.rc.in diff --git a/version.h.in b/version.h.in index 0570f8a08..b4b9c9d57 100644 --- a/version.h.in +++ b/version.h.in @@ -2,7 +2,7 @@ #define VERSION_H #define METAFORCE_WC_DESCRIBE "@METAFORCE_WC_DESCRIBE@" -#define METAFORCE_VERSION_STRING "@METAFORCE_VERISON_STRING@" +#define METAFORCE_VERSION_STRING "@METAFORCE_VERSION_STRING@" #define METAFORCE_WC_BRANCH "@METAFORCE_WC_BRANCH@" #define METAFORCE_WC_REVISION "@METAFORCE_WC_REVISION@"