From 99b8b6dbbbb7c8c1b2044c394486e1d379cb0214 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 25 May 2015 12:36:58 -0400 Subject: [PATCH] Move versioning info to standalone file. Thanks to @cybik for some of the assistance. --- CMake/SMDefs.cmake | 20 ++++++++++++++++++++ CMakeLists.txt | 21 +-------------------- 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 CMake/SMDefs.cmake diff --git a/CMake/SMDefs.cmake b/CMake/SMDefs.cmake new file mode 100644 index 0000000000..8cc6951f7a --- /dev/null +++ b/CMake/SMDefs.cmake @@ -0,0 +1,20 @@ +# Set up version numbers according to the new scheme. +set(SM_VERSION_MAJOR 5) +set(SM_VERSION_MINOR 0) +set(SM_VERSION_PATCH 8) +set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}") + +execute_process(COMMAND git rev-parse --short HEAD + WORKING_DIRECTORY "${SM_ROOT_DIR}" + OUTPUT_VARIABLE SM_VERSION_GIT_HASH + RESULT_VARIABLE ret + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +if(NOT (ret STREQUAL "0")) + set(SM_VERSION_GIT_HASH "UNKNOWN") + set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}") +else() + set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}") +endif() + diff --git a/CMakeLists.txt b/CMakeLists.txt index 42ba607d7a..ccc8ff03bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,26 +46,7 @@ endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/") include("CMake/DefineOptions.cmake") - -# Set up version numbers according to the new scheme. -set(SM_VERSION_MAJOR 5) -set(SM_VERSION_MINOR 0) -set(SM_VERSION_PATCH 8) -set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}") - -execute_process(COMMAND git rev-parse --short HEAD - WORKING_DIRECTORY "${SM_ROOT_DIR}" - OUTPUT_VARIABLE SM_VERSION_GIT_HASH - RESULT_VARIABLE ret - OUTPUT_STRIP_TRAILING_WHITESPACE -) - -if(NOT (ret STREQUAL "0")) - set(SM_VERSION_GIT_HASH "UNKNOWN") - set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}") -else() - set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}") -endif() +include("CMake/SMDefs.cmake") # Put the predefined targets in separate groups. set_property(GLOBAL PROPERTY USE_FOLDERS ON)