diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersionCompute.cmake | 1 | ||||
| -rw-r--r-- | Source/CMakeVersionSource.cmake | 9 |
3 files changed, 2 insertions, 10 deletions
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index da0aba0..aabc839 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 6) -set(CMake_VERSION_PATCH 20160823) +set(CMake_VERSION_PATCH 20160824) #set(CMake_VERSION_RC 1) diff --git a/Source/CMakeVersionCompute.cmake b/Source/CMakeVersionCompute.cmake index 3bdcfd6..d9218d7 100644 --- a/Source/CMakeVersionCompute.cmake +++ b/Source/CMakeVersionCompute.cmake @@ -7,6 +7,7 @@ if("${CMake_VERSION_PATCH}" VERSION_LESS 20000000) set(CMake_VERSION_IS_RELEASE 1) set(CMake_VERSION_SOURCE "") else() + set(CMake_VERSION_IS_DIRTY 0) # may be set to 1 by CMakeVersionSource set(CMake_VERSION_IS_RELEASE 0) include(${CMake_SOURCE_DIR}/Source/CMakeVersionSource.cmake) endif() diff --git a/Source/CMakeVersionSource.cmake b/Source/CMakeVersionSource.cmake index bc5975e..5ea1de3 100644 --- a/Source/CMakeVersionSource.cmake +++ b/Source/CMakeVersionSource.cmake @@ -24,16 +24,7 @@ if(EXISTS ${CMake_SOURCE_DIR}/.git/HEAD) ) if(dirty) set(CMake_VERSION_IS_DIRTY 1) - else() - set(CMake_VERSION_IS_DIRTY 0) endif() endif() endif() -elseif(EXISTS ${CMake_SOURCE_DIR}/CVS/Repository) - file(READ ${CMake_SOURCE_DIR}/CVS/Repository repo) - set(branch "") - if("${repo}" MATCHES "\\.git/([^\r\n]*)") - set(branch "${CMAKE_MATCH_1}") - endif() - set(CMake_VERSION_SOURCE "cvs${branch}") endif() |