diff options
| author | Frank Park <y.piao.us@ieee.org> | 2016-04-15 18:02:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-15 18:59:06 (GMT) |
| commit | 19e8752b86a015832b3414f55a298bda9896fc62 (patch) | |
| tree | dbdae3941af07648fe4c38f3546b515c8cb341d2 | |
| parent | 52dddefcbbd2a79826fe9cb5b5fe787c6cdfe2a8 (diff) | |
| download | CMake-19e8752b86a015832b3414f55a298bda9896fc62.zip CMake-19e8752b86a015832b3414f55a298bda9896fc62.tar.gz CMake-19e8752b86a015832b3414f55a298bda9896fc62.tar.bz2 | |
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.
| -rw-r--r-- | Modules/FindGit.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
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() |