[Cmake-commits] CMake branch, next, updated. v2.8.1-1277-g839bb1d

[cmake-commits at cmake.org]

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  839bb1d7100f0ebd1312d5d18d15905d847a4726 (commit)
       via  e73ad22e384b392834614ab63c3d65543e78829a (commit)
      from  615f619a9070974823dcf173e6a492e290427c04 (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=839bb1d7100f0ebd1312d5d18d15905d847a4726
commit 839bb1d7100f0ebd1312d5d18d15905d847a4726
Merge: 615f619 e73ad22
Author: David Cole <david.cole at kitware.com>
Date:   Wed Jun 2 18:06:47 2010 -0400

    Merge branch 'add-git-to-ExternalProject' into next

diff --cc Tests/ExternalProject/CMakeLists.txt
index 8c4b18b,4c93ef3..8bdec56
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@@ -216,9 -160,8 +216,9 @@@ if(do_cvs_tests
    ExternalProject_Add(${proj}
      SOURCE_DIR ${local_cvs_repo}
      URL ${CMAKE_CURRENT_SOURCE_DIR}/cvsrepo.tgz
 +    URL_MD5 55fc85825ffdd9ed2597123c68b79f7e
      BUILD_COMMAND ""
-     CONFIGURE_COMMAND ${CVS_EXECUTABLE} --version
+     CONFIGURE_COMMAND "${CVS_EXECUTABLE}" --version
      INSTALL_COMMAND ""
    )
  
@@@ -315,9 -256,8 +315,9 @@@ if(do_svn_tests
    ExternalProject_Add(${proj}
      SOURCE_DIR ${local_svn_repo}
      URL ${CMAKE_CURRENT_SOURCE_DIR}/svnrepo.tgz
 +    URL_MD5 2f468be4ed1fa96377fca0cc830819c4
      BUILD_COMMAND ""
-     CONFIGURE_COMMAND ${Subversion_SVN_EXECUTABLE} --version
+     CONFIGURE_COMMAND "${Subversion_SVN_EXECUTABLE}" --version
      INSTALL_COMMAND ""
    )
  

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e73ad22e384b392834614ab63c3d65543e78829a
commit e73ad22e384b392834614ab63c3d65543e78829a
Author: David Cole <david.cole at kitware.com>
Date:   Wed Jun 2 18:05:41 2010 -0400

    Fix ExternalProject test failures on dashboards.
    
    Double quote executable names that may have spaces in them.
    Do not run the new git portions of the test on machines that
    have git < version 1.6.5 on them.

diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index 09b7619..4c93ef3 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -161,7 +161,7 @@ if(do_cvs_tests)
     SOURCE_DIR ${local_cvs_repo}
     URL ${CMAKE_CURRENT_SOURCE_DIR}/cvsrepo.tgz
     BUILD_COMMAND ""
-    CONFIGURE_COMMAND ${CVS_EXECUTABLE} --version
+    CONFIGURE_COMMAND "${CVS_EXECUTABLE}" --version
     INSTALL_COMMAND ""
   )
 
@@ -257,7 +257,7 @@ if(do_svn_tests)
     SOURCE_DIR ${local_svn_repo}
     URL ${CMAKE_CURRENT_SOURCE_DIR}/svnrepo.tgz
     BUILD_COMMAND ""
-    CONFIGURE_COMMAND ${Subversion_SVN_EXECUTABLE} --version
+    CONFIGURE_COMMAND "${Subversion_SVN_EXECUTABLE}" --version
     INSTALL_COMMAND ""
   )
 
@@ -304,6 +304,19 @@ 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()
 
 
@@ -318,7 +331,7 @@ if(do_git_tests)
     SOURCE_DIR ${local_git_repo}
     URL ${CMAKE_CURRENT_SOURCE_DIR}/gitrepo.tgz
     BUILD_COMMAND ""
-    CONFIGURE_COMMAND ${git_EXECUTABLE} --version
+    CONFIGURE_COMMAND "${git_EXECUTABLE}" --version
     INSTALL_COMMAND ""
   )
 

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

Summary of changes:
 Tests/ExternalProject/CMakeLists.txt |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake