From 98780a56520d9b9af79aa023959b0d61938b5231 Mon Sep 17 00:00:00 2001 From: Renaud Lepage Date: Mon, 25 May 2015 15:29:06 -0700 Subject: [PATCH 1/3] Reintroduce VersionUpdater, but limit it to Win32 --- src/CMakeLists.txt | 22 +++++++++++++--------- src/version_updater/version.hpp.in | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 src/version_updater/version.hpp.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 91f4ea6b77..98dbfe8221 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,17 @@ file(MAKE_DIRECTORY "${SM_SRC_DIR}/generated") -# Version Stub generation +if(WIN32) +# Version Updater library. +add_subdirectory(version_updater) + +# This part may move to a different file: it's the SM Data project. +add_custom_command( + OUTPUT ${SM_SRC_DIR}/generated/verstub.cpp + COMMAND VersionUpdater ${SM_SRC_DIR}/verstub.cpp + DEPENDS VersionUpdater +) +else() +# Version Stub generation. Needs fixing on Windows. add_custom_command( OUTPUT ${SM_SRC_DIR}/generated/verstub.cpp COMMAND ${CMAKE_COMMAND} @@ -8,14 +19,7 @@ add_custom_command( WORKING_DIRECTORY "${SM_ROOT_DIR}" DEPENDS ${SM_SRC_DIR}/generated/delete ) -if(WIN32) -add_custom_command( - OUTPUT ${SM_SRC_DIR}/generated/delete - COMMAND del - ARGS ${SM_SRC_DIR}/generated/ver* - WORKING_DIRECTORY "${SM_ROOT_DIR}" -) -else() + add_custom_command( OUTPUT ${SM_SRC_DIR}/generated/delete COMMAND rm diff --git a/src/version_updater/version.hpp.in b/src/version_updater/version.hpp.in new file mode 100644 index 0000000000..4c50f75a43 --- /dev/null +++ b/src/version_updater/version.hpp.in @@ -0,0 +1,15 @@ +#ifndef VERSION_UPDATER_HPP_ +#define VERSION_UPDATER_HPP_ + +int smVersionMajor = @SM_VERSION_MAJOR@; +int smVersionMinor = @SM_VERSION_MINOR@; +int smVersionPatch = @SM_VERSION_PATCH@; +char const * const smVersionGitHash = "@SM_VERSION_GIT_HASH@"; +#if defined(IS_FULL_RELEASE) +char const * const smVersionFull = "@SM_VERSION_TRADITIONAL@"; +#else +char const * const smVersionFull = "@SM_VERSION_FULL@"; +#endif +char const * const smVersionTraditional = "@SM_VERSION_TRADITIONAL@"; + +#endif \ No newline at end of file From a24b4f515fcf7c0e84ad926103c99ac11f76f866 Mon Sep 17 00:00:00 2001 From: Renaud Lepage Date: Mon, 25 May 2015 15:46:49 -0700 Subject: [PATCH 2/3] Per @wolfman2000 's recommendation. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 98dbfe8221..2c584d65d2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ file(MAKE_DIRECTORY "${SM_SRC_DIR}/generated") -if(WIN32) +if(MSVC) # Version Updater library. add_subdirectory(version_updater) From 1ffef38b6f2506a0c9a93c90305b04cb15f9fa4c Mon Sep 17 00:00:00 2001 From: Renaud Lepage Date: Mon, 25 May 2015 15:50:20 -0700 Subject: [PATCH 3/3] Copy-paste error --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2c584d65d2..577279d837 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ add_subdirectory(version_updater) # This part may move to a different file: it's the SM Data project. add_custom_command( OUTPUT ${SM_SRC_DIR}/generated/verstub.cpp - COMMAND VersionUpdater ${SM_SRC_DIR}/verstub.cpp + COMMAND VersionUpdater ${SM_SRC_DIR}/generated/verstub.cpp DEPENDS VersionUpdater ) else()