[Cmake-commits] CMake branch, next, updated. v3.0.1-4906-g3b10600

Brad King brad.king at kitware.com
Wed Aug 13 15:36:28 EDT 2014


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  3b10600e60b9f24bea1bcfbca0dda5a93ecc9085 (commit)
       via  8d070a044a901cc9a33acd81cf00d4a9a3c9aa52 (commit)
      from  91d45dd1ef90f8a56689eda81e768e61db3905b6 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b10600e60b9f24bea1bcfbca0dda5a93ecc9085
commit 3b10600e60b9f24bea1bcfbca0dda5a93ecc9085
Merge: 91d45dd 8d070a0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 13 15:36:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 13 15:36:28 2014 -0400

    Merge topic 'ctest_update_status_only' into next
    
    8d070a04 Tests: Revert accidental Git executable filter removal


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d070a044a901cc9a33acd81cf00d4a9a3c9aa52
commit 8d070a044a901cc9a33acd81cf00d4a9a3c9aa52
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 13 15:36:35 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 13 15:37:22 2014 -0400

    Tests: Revert accidental Git executable filter removal
    
    We cannot use the cygwin Git for the UpdateGIT test on Windows.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d36f3ac..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2012,9 +2012,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     mark_as_advanced(GIT_EXECUTABLE)
     set(CTEST_TEST_UPDATE_GIT 0)
     if(GIT_EXECUTABLE)
-#      if(NOT "${GIT_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
+      if(NOT "${GIT_EXECUTABLE}" MATCHES "cygwin" OR UNIX)
         set(CTEST_TEST_UPDATE_GIT 1)
-#      endif()
+      endif()
     endif()
     if(CTEST_TEST_UPDATE_GIT)
       set(CTestUpdateGIT_DIR "CTest UpdateGIT")

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

Summary of changes:
 Tests/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list