[Cmake-commits] CMake branch, next, updated. v3.5.2-963-g7eada2a

[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  7eada2a3afdac880b6dd4489152148443663a284 (commit)
       via  19e8752b86a015832b3414f55a298bda9896fc62 (commit)
      from  4b8de2f05805aefa3dbbc22b1da4ddba1f7200ca (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=7eada2a3afdac880b6dd4489152148443663a284
commit 7eada2a3afdac880b6dd4489152148443663a284
Merge: 4b8de2f 19e8752
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 15 15:03:35 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 15 15:03:35 2016 -0400

    Merge topic 'FindGit-update-github-location' into next
    
    19e8752b FindGit: Add new 'GitHub for Windows' user directory


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19e8752b86a015832b3414f55a298bda9896fc62
commit 19e8752b86a015832b3414f55a298bda9896fc62
Author:     Frank Park <y.piao.us at ieee.org>
AuthorDate: Fri Apr 15 14:02:07 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 15 14:59:06 2016 -0400

    FindGit: Add new 'GitHub for Windows' user directory
    
    GitHub for Windows now installs in
    
        $ENV{LOCALAPPDATA}/Github/PortableGit*/cmd
    
    instead of
    
        $ENV{LOCALAPPDATA}/Github/PortableGit*/bin
    
    Search the new location first but keep the old one in case people have
    older versions installed.

diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake
index d18f965..95188ce 100644
--- a/Modules/FindGit.cmake
+++ b/Modules/FindGit.cmake
@@ -45,8 +45,10 @@ 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}")
+    file(GLOB github_path
+      "$ENV{LOCALAPPDATA}/Github/PortableGit*/cmd"
+      "$ENV{LOCALAPPDATA}/Github/PortableGit*/bin"
+      )
     # SourceTree search path for Windows
     set(_git_sourcetree_path "$ENV{LOCALAPPDATA}/Atlassian/SourceTree/git_local/bin")
   endif()

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

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


hooks/post-receive
-- 
CMake