[Cmake-commits] CMake branch, dashboard, updated. 0272ca45ae47f54c4be8872ef1544cc8dd5523e2

[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, dashboard has been updated
       via  0272ca45ae47f54c4be8872ef1544cc8dd5523e2 (commit)
       via  90221c8ea1699deb4a7a37fcd0833945a31d6f4d (commit)
      from  2228366c3ee66de17b01639edfb1f575336a49d3 (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=0272ca45ae47f54c4be8872ef1544cc8dd5523e2
commit 0272ca45ae47f54c4be8872ef1544cc8dd5523e2
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 15 07:44:42 2010 -0400

    Store GIT_EXECUTABLE in CMake cache
    
    Tell the CMake build where to find the Git used by the dashboard.
    On machines where we do not find it easily the dashboard client
    script already tells us where to find it.

diff --git a/cmake_common.cmake b/cmake_common.cmake
index d1579e3..41e9d33 100644
--- a/cmake_common.cmake
+++ b/cmake_common.cmake
@@ -33,7 +33,7 @@
 #   dashboard_cvs_tag     = CVS tag to checkout (ex: CMake-2-6)
 #   dashboard_do_coverage = True to enable coverage (ex: gcov)
 #   dashboard_do_memcheck = True to enable memcheck (ex: valgrind)
-#   CTEST_UPDATE_COMMAND  = path to svn command-line client
+#   CTEST_GIT_COMMAND     = path to git command-line client
 #   CTEST_BUILD_FLAGS     = build tool arguments (ex: -j2)
 #   CTEST_DASHBOARD_ROOT  = Where to put source and build trees
 #   CTEST_TEST_CTEST      = Whether to run long CTestTest* tests
@@ -318,6 +318,10 @@ macro(write_cache)
       set(cache_make_program CMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM})
     endif()
   endif()
+  set(cache_git_executable "")
+  if(CTEST_GIT_COMMAND)
+    set(cache_git_executable "GIT_EXECUTABLE:FILEPATH=${CTEST_GIT_COMMAND}")
+  endif()
   file(WRITE ${CTEST_BINARY_DIRECTORY}/CMakeCache.txt "
 SITE:STRING=${CTEST_SITE}
 BUILDNAME:STRING=${CTEST_BUILD_NAME}
@@ -326,6 +330,7 @@ CTEST_USE_LAUNCHERS:BOOL=${CTEST_USE_LAUNCHERS}
 DART_TESTING_TIMEOUT:STRING=${CTEST_TEST_TIMEOUT}
 ${cache_build_type}
 ${cache_make_program}
+${cache_git_executable}
 ${dashboard_cache}
 ")
 endmacro(write_cache)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90221c8ea1699deb4a7a37fcd0833945a31d6f4d
commit 90221c8ea1699deb4a7a37fcd0833945a31d6f4d
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 15 07:38:29 2010 -0400

    Test 'next' by default for non-nightly builds

diff --git a/cmake_common.cmake b/cmake_common.cmake
index 08b439a..d1579e3 100644
--- a/cmake_common.cmake
+++ b/cmake_common.cmake
@@ -111,7 +111,7 @@ if(dashboard_use_git_repo)
     if("${dashboard_model}" STREQUAL "Nightly")
       set(dashboard_git_branch nightly)
     else()
-      set(dashboard_git_branch master)
+      set(dashboard_git_branch next)
     endif()
   endif()
   if(NOT DEFINED dashboard_git_crlf)

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

Summary of changes:
 cmake_common.cmake |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake