[Cmake-commits] CMake branch, next, updated. v3.1.0-1821-g56db783

[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, next has been updated
       via  56db783f0c5e882d45c6f78f5d46dbf3f1c09ae4 (commit)
       via  546906243d21727ac6c1bab0210fc028ff80c3c0 (commit)
      from  9e514a10d87fe26eec2920ef6f5b4ce299b6c8fb (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=56db783f0c5e882d45c6f78f5d46dbf3f1c09ae4
commit 56db783f0c5e882d45c6f78f5d46dbf3f1c09ae4
Merge: 9e514a1 5469062
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 13 09:59:57 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 13 09:59:57 2015 -0500

    Merge topic 'FindGit-local-Github' into next
    
    54690624 FindGit: Search in 'GitHub for Windows' user directory


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=546906243d21727ac6c1bab0210fc028ff80c3c0
commit 546906243d21727ac6c1bab0210fc028ff80c3c0
Author:     Frank Park <ypiao at wpi.edu>
AuthorDate: Mon Jan 12 21:23:37 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 13 08:54:31 2015 -0500

    FindGit: Search in 'GitHub for Windows' user directory

diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake
index 570538d..b4f7b4b 100644
--- a/Modules/FindGit.cmake
+++ b/Modules/FindGit.cmake
@@ -45,11 +45,15 @@ set(git_names git eg)
 if(WIN32)
   if(NOT CMAKE_GENERATOR MATCHES "MSYS")
     set(git_names git.cmd git eg.cmd eg)
+    # GitHub search path for Windows
+    set(github_path "$ENV{LOCALAPPDATA}/Github/PortableGit*/bin")
+    file(GLOB github_path "${github_path}")
   endif()
 endif()
 
 find_program(GIT_EXECUTABLE
   NAMES ${git_names}
+  PATHS ${github_path}
   PATH_SUFFIXES Git/cmd Git/bin
   DOC "git command line client"
   )

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

Summary of changes:
 Modules/FindGit.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake