[Cmake-commits] CMake branch, next, updated. v3.6.1-1330-g683a631

[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  683a63143a68a9ef50c659e86693a16ccc210c8d (commit)
       via  aec06dd4922187ce5346d20a9f0d53f01b6ce9fc (commit)
       via  ef13efab56464890f171c2a2142b64b728f4f2e8 (commit)
      from  9c9dd3f3ab771a24254960784e77975f4f1d3a7e (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=683a63143a68a9ef50c659e86693a16ccc210c8d
commit 683a63143a68a9ef50c659e86693a16ccc210c8d
Merge: 9c9dd3f aec06dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 23 09:13:15 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 23 09:13:15 2016 -0400

    Merge topic 'version-cleanups' into next
    
    aec06dd4 Version: Always define CMake_VERSION_IS_DIRTY to 0 or 1
    ef13efab Version: Remove check for existence of CVS repository


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aec06dd4922187ce5346d20a9f0d53f01b6ce9fc
commit aec06dd4922187ce5346d20a9f0d53f01b6ce9fc
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:11:57 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=ef13efab56464890f171c2a2142b64b728f4f2e8
commit ef13efab56464890f171c2a2142b64b728f4f2e8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Aug 22 23:46:01 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 23 09:11:57 2016 -0400

    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()

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

Summary of changes:


hooks/post-receive
-- 
CMake