From c72f8513f7adc764aafd94f2deb9071ee1f261d9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 19 Sep 2013 15:45:41 -0400 Subject: [PATCH] Factor CMake version logic into dedicated module Move logic to compute CMake_VERSION out of the top-level CMakeLists.txt file to a dedicated Source/CMakeVersionCompute.cmake module and include it from the original location. This will allow it to be re-used. --- CMakeLists.txt | 23 ++--------------------- Source/CMakeVersionCompute.cmake | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 Source/CMakeVersionCompute.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f3bc6603..92040267e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,27 +411,8 @@ endif() # The main section of the CMakeLists file # #----------------------------------------------------------------------- -include(Source/CMakeVersion.cmake) -# Releases define a small tweak level. -if("${CMake_VERSION_TWEAK}" VERSION_LESS 20000000) - set(CMake_VERSION_IS_RELEASE 1) - set(CMake_VERSION_SOURCE "") -else() - set(CMake_VERSION_IS_RELEASE 0) - include(${CMake_SOURCE_DIR}/Source/CMakeVersionSource.cmake) -endif() - -# Compute the full version string. -set(CMake_VERSION ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}) -if(${CMake_VERSION_TWEAK} GREATER 0) - set(CMake_VERSION ${CMake_VERSION}.${CMake_VERSION_TWEAK}) -endif() -if(CMake_VERSION_RC) - set(CMake_VERSION ${CMake_VERSION}-rc${CMake_VERSION_RC}) -endif() -if(CMake_VERSION_SOURCE) - set(CMake_VERSION ${CMake_VERSION}-${CMake_VERSION_SOURCE}) -endif() +# Compute CMake_VERSION, etc. +include(Source/CMakeVersionCompute.cmake) # Include the standard Dart testing module enable_testing() diff --git a/Source/CMakeVersionCompute.cmake b/Source/CMakeVersionCompute.cmake new file mode 100644 index 000000000..a1663342e --- /dev/null +++ b/Source/CMakeVersionCompute.cmake @@ -0,0 +1,23 @@ +# Load version number components. +include(${CMake_SOURCE_DIR}/Source/CMakeVersion.cmake) + +# Releases define a small tweak level. +if("${CMake_VERSION_TWEAK}" VERSION_LESS 20000000) + set(CMake_VERSION_IS_RELEASE 1) + set(CMake_VERSION_SOURCE "") +else() + set(CMake_VERSION_IS_RELEASE 0) + include(${CMake_SOURCE_DIR}/Source/CMakeVersionSource.cmake) +endif() + +# Compute the full version string. +set(CMake_VERSION ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}) +if(${CMake_VERSION_TWEAK} GREATER 0) + set(CMake_VERSION ${CMake_VERSION}.${CMake_VERSION_TWEAK}) +endif() +if(CMake_VERSION_RC) + set(CMake_VERSION ${CMake_VERSION}-rc${CMake_VERSION_RC}) +endif() +if(CMake_VERSION_SOURCE) + set(CMake_VERSION ${CMake_VERSION}-${CMake_VERSION_SOURCE}) +endif()