[Cmake-commits] CMake branch, dashboard, updated. 8363f4f8bb3f57991ddb70e3d288ff96f6ff2cea

[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  8363f4f8bb3f57991ddb70e3d288ff96f6ff2cea (commit)
       via  938c86ba1fc0121387038e65b511491a9336f7a3 (commit)
      from  11006a894ef27738942c08abc300f15906c0e5c9 (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=8363f4f8bb3f57991ddb70e3d288ff96f6ff2cea
commit 8363f4f8bb3f57991ddb70e3d288ff96f6ff2cea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 27 06:48:13 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 27 06:48:36 2017 -0400

    cmake_common: Fix typo in comment
    
    Reported-by: Alan W. Irwin <irwin at beluga.phys.uvic.ca>

diff --git a/cmake_common.cmake b/cmake_common.cmake
index b063829..4b78c9c 100644
--- a/cmake_common.cmake
+++ b/cmake_common.cmake
@@ -469,7 +469,7 @@ while(NOT dashboard_done)
     if(NOT dashboard_no_test)
       ctest_test(${CTEST_TEST_ARGS})
     endif()
-    set(safe_message_skip 1) # Block furhter messages
+    set(safe_message_skip 1) # Block further messages
 
     if(dashboard_do_coverage)
       ctest_coverage()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=938c86ba1fc0121387038e65b511491a9336f7a3
commit 938c86ba1fc0121387038e65b511491a9336f7a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 13 10:55:08 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 13 10:58:08 2017 -0400

    cmake_common: Avoid finding VS 2017 non-general Git installation
    
    At a VS 2017 command prompt the PATH contains a directory that happens
    to have a `Git/cmd/git.exe` inside it. However, this executable is not
    meant for general use. Revise our use of Git/ path suffixes to be more
    specific to its original purpose of searching in the typical
    `c:/Program Files*/Git/` installation directories.  Avoid using the
    suffixes on PATH entries.

diff --git a/cmake_common.cmake b/cmake_common.cmake
index 075920d..b063829 100644
--- a/cmake_common.cmake
+++ b/cmake_common.cmake
@@ -162,10 +162,22 @@ endif()
 
 # Look for a GIT command-line client.
 if(NOT DEFINED CTEST_GIT_COMMAND)
-  find_program(CTEST_GIT_COMMAND
-    NAMES git git.cmd
-    PATH_SUFFIXES Git/cmd Git/bin
-    )
+  set(git_names git git.cmd)
+
+  # First search the PATH.
+  find_program(CTEST_GIT_COMMAND NAMES ${git_names})
+
+  if(CMAKE_HOST_WIN32)
+    # Now look for installations in Git/ directories under typical installation
+    # prefixes on Windows.  Exclude PATH from this search because VS 2017's
+    # command prompt happens to have a PATH entry with a Git/ subdirectory
+    # containing a minimal git not meant for general use.
+    find_program(CTEST_GIT_COMMAND
+      NAMES ${git_names}
+      PATH_SUFFIXES Git/cmd Git/bin
+      NO_SYSTEM_ENVIRONMENT_PATH
+      )
+  endif()
 endif()
 if(NOT CTEST_GIT_COMMAND)
   message(FATAL_ERROR "CTEST_GIT_COMMAND not available!")

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

Summary of changes:
 cmake_common.cmake |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake