[Cmake-commits] CMake branch, next, updated. v3.6.1-1327-g9c9dd3f

[Brad King]

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  9c9dd3f3ab771a24254960784e77975f4f1d3a7e (commit)
       via  617af35806961859b3ef479e793cb6d48be6c30d (commit)
       via  a9b8668f4306023f2a046221c8c27e486484b1ae (commit)
      from  916478fcca7cf98494207507e1567360b07dbddd (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=9c9dd3f3ab771a24254960784e77975f4f1d3a7e
commit 9c9dd3f3ab771a24254960784e77975f4f1d3a7e
Merge: 916478f 617af35
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 23 09:13:09 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 23 09:13:09 2016 -0400

    Merge topic 'version-cleanups' into next
    
    617af358 Version: Always define CMake_VERSION_IS_DIRTY to 0 or 1
    a9b8668f Revert "Version: Use cmakedefine01 for boolean"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=617af35806961859b3ef479e793cb6d48be6c30d
commit 617af35806961859b3ef479e793cb6d48be6c30d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 23 09:09:03 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 23 09:09:36 2016 -0400

    Version: Always define CMake_VERSION_IS_DIRTY to 0 or 1
    
    In cmVersionConfig.h we must define this macro with a value because
    clients expect it to have one.  Also ensure that all CMakeLists.txt
    code paths have an initialized value.
    
    Reported-by: Stephen Kelly <steveire at gmail.com>

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 4f22ded..5ea1de3 100644
--- a/Source/CMakeVersionSource.cmake
+++ b/Source/CMakeVersionSource.cmake
@@ -24,8 +24,6 @@ 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()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9b8668f4306023f2a046221c8c27e486484b1ae
commit a9b8668f4306023f2a046221c8c27e486484b1ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 23 09:06:24 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 23 09:06:24 2016 -0400

    Revert "Version: Use cmakedefine01 for boolean"
    
    This reverts commit 6a1e4d673a8ecf9aaf3d7335c84d454c40f417f9.

diff --git a/Source/cmVersionConfig.h.in b/Source/cmVersionConfig.h.in
index ab3c1af..92abfbe 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@"
-#cmakedefine01 CMake_VERSION_IS_DIRTY
+#define CMake_VERSION_IS_DIRTY @CMake_VERSION_IS_DIRTY@
 #define CMake_VERSION "@CMake_VERSION@"

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

Summary of changes:
 Source/CMakeVersionCompute.cmake |    1 +
 Source/CMakeVersionSource.cmake  |    2 --
 Source/cmVersionConfig.h.in      |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake