[Cmake-commits] CMake branch, next, updated. v2.8.10.1-844-g3071f80

David Cole david.cole at kitware.com
Fri Nov 9 14:31:59 EST 2012


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  3071f805b78fa9a9781033d5c4cadc84e6eadf23 (commit)
       via  0fc55e27bb45ffb128838756e42187060c6fb387 (commit)
      from  6d88ba91dcce4ba334dac1c312835f7c6006481c (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=3071f805b78fa9a9781033d5c4cadc84e6eadf23
commit 3071f805b78fa9a9781033d5c4cadc84e6eadf23
Merge: 6d88ba9 0fc55e2
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 9 14:31:51 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 9 14:31:51 2012 -0500

    Merge topic 'only-git-fetch-when-necessary' into next
    
    0fc55e2 ExternalProjectUpdateTest: Only support Git 1.6.5 and greater.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fc55e27bb45ffb128838756e42187060c6fb387
commit 0fc55e27bb45ffb128838756e42187060c6fb387
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Fri Nov 9 13:45:52 2012 +0000
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Nov 9 14:28:11 2012 -0500

    ExternalProjectUpdateTest: Only support Git 1.6.5 and greater.

diff --git a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake
index bc5ea5e..0916d41 100644
--- a/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake
+++ b/Tests/ExternalProjectUpdate/ExternalProjectUpdateTest.cmake
@@ -61,7 +61,25 @@ was expected."
 endmacro()
 
 find_package(Git)
+set(do_git_tests 0)
 if(GIT_EXECUTABLE)
+  set(do_git_tests 1)
+
+  execute_process(
+    COMMAND "${GIT_EXECUTABLE}" --version
+    OUTPUT_VARIABLE ov
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  string(REGEX REPLACE "^git version (.+)$" "\\1" git_version "${ov}")
+  message(STATUS "git_version='${git_version}'")
+
+  if(git_version VERSION_LESS 1.6.5)
+    message(STATUS "No ExternalProject git tests with git client less than version 1.6.5")
+    set(do_git_tests 0)
+  endif()
+endif()
+
+if(do_git_tests)
   check_a_tag(origin/master 5842b503ba4113976d9bb28d57b5aee1ad2736b7 1)
   check_a_tag(tag1          d1970730310fe8bc07e73f15dc570071f9f9654a 1)
   # With the Git UPDATE_COMMAND performance patch, this will not required a

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

Summary of changes:
 .../ExternalProjectUpdateTest.cmake                |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list