diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-24 13:45:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-24 13:45:33 (GMT) |
| commit | 2986ca5ecc0120790c7fc8801647078f3475be18 (patch) | |
| tree | 5e08ea71d5fa544a10129b7baafc8a3b50d34651 /Source | |
| parent | a71ca1f0b3a405e6ff1ea4b09badcc345581ddba (diff) | |
| parent | aec06dd4922187ce5346d20a9f0d53f01b6ce9fc (diff) | |
| download | CMake-2986ca5ecc0120790c7fc8801647078f3475be18.zip CMake-2986ca5ecc0120790c7fc8801647078f3475be18.tar.gz CMake-2986ca5ecc0120790c7fc8801647078f3475be18.tar.bz2 | |
Merge topic 'version-cleanups'
aec06dd4 Version: Always define CMake_VERSION_IS_DIRTY to 0 or 1
ef13efab Version: Remove check for existence of CVS repository
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeVersionCompute.cmake | 1 | ||||
| -rw-r--r-- | Source/CMakeVersionSource.cmake | 9 |
2 files changed, 1 insertions, 9 deletions
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() |