[Cmake-commits] CMake branch, next, updated. v3.6.1-1313-g41b3c6b

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  41b3c6b77a37839c5bbf93c2f4b2a19de55ab19b (commit)
       via  d10f2d8b29f54388f74beaaf4a56275d881f5b85 (commit)
       via  6a1e4d673a8ecf9aaf3d7335c84d454c40f417f9 (commit)
      from  cdf7e5800504307b820f742fc3944391d6e37292 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41b3c6b77a37839c5bbf93c2f4b2a19de55ab19b
commit 41b3c6b77a37839c5bbf93c2f4b2a19de55ab19b
Merge: cdf7e58 d10f2d8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 22 17:55:49 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 22 17:55:49 2016 -0400

    Merge topic 'version-cleanups' into next
    
    d10f2d8b Version: Remove check for existence of CVS repository
    6a1e4d67 Version: Use cmakedefine01 for boolean


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d10f2d8b29f54388f74beaaf4a56275d881f5b85
commit d10f2d8b29f54388f74beaaf4a56275d881f5b85
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 22 23:46:01 2016 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 22 23:54:46 2016 +0200

    Version: Remove check for existence of CVS repository

diff --git a/Source/CMakeVersionSource.cmake b/Source/CMakeVersionSource.cmake
index bc5975e..4f22ded 100644
--- a/Source/CMakeVersionSource.cmake
+++ b/Source/CMakeVersionSource.cmake
@@ -29,11 +29,4 @@ if(EXISTS ${CMake_SOURCE_DIR}/.git/HEAD)
       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()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a1e4d673a8ecf9aaf3d7335c84d454c40f417f9
commit 6a1e4d673a8ecf9aaf3d7335c84d454c40f417f9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 27 00:07:32 2016 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Aug 22 23:52:14 2016 +0200

    Version: Use cmakedefine01 for boolean
    
    The CMake_VERSION_IS_DIRTY CMake variable is not set by
    CMakeVersionCompute or its delegate if not building from git, or if the
    git executable is not found.
    
    That means that cmVersionConfig.h would be generated to contain an empty
    C++ define for CMake_VERSION_IS_DIRTY.
    
    cmake::ReportCapabilities() requires the preprocessor define to have a
    value, so use the standard construct for booleans of cmakedefine01.

diff --git a/Source/cmVersionConfig.h.in b/Source/cmVersionConfig.h.in
index 92abfbe..ab3c1af 100644
--- a/Source/cmVersionConfig.h.in
+++ b/Source/cmVersionConfig.h.in
@@ -13,5 +13,5 @@
 #define CMake_VERSION_MINOR @CMake_VERSION_MINOR@
 #define CMake_VERSION_PATCH @CMake_VERSION_PATCH@
 #define CMake_VERSION_SUFFIX "@CMake_VERSION_SUFFIX@"
-#define CMake_VERSION_IS_DIRTY @CMake_VERSION_IS_DIRTY@
+#cmakedefine01 CMake_VERSION_IS_DIRTY
 #define CMake_VERSION "@CMake_VERSION@"

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersionSource.cmake |    7 -------
 Source/cmVersionConfig.h.in     |    2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)


hooks/post-receive
-- 
CMake