summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-18 12:57:23 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-04-18 12:57:23 (GMT)
commit942e9d5019853ea3274e883f2389d80f7f0dbc66 (patch)
treeccfe5c78987ccfeb247e057d17ef5d4883cc6f09
parent49c4d665dcb75fe92c8923fdd1fb13e7131d4391 (diff)
parent19e8752b86a015832b3414f55a298bda9896fc62 (diff)
downloadCMake-942e9d5019853ea3274e883f2389d80f7f0dbc66.zip
CMake-942e9d5019853ea3274e883f2389d80f7f0dbc66.tar.gz
CMake-942e9d5019853ea3274e883f2389d80f7f0dbc66.tar.bz2
Merge topic 'FindGit-update-github-location'
19e8752b FindGit: Add new 'GitHub for Windows' user directory
-rw-r--r--Modules/FindGit.cmake6
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()