summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Wojniak <kainjow@kainjow.com>2015-10-12 19:06:26 (GMT)
committerBrad King <brad.king@kitware.com>2015-10-12 19:22:38 (GMT)
commit57f701a7f045fc13807933860bad22fa405c6621 (patch)
treeed4c6c0e631531ee2d536cca785869c1bd8b1330
parente5fb30fb5bdff2913cc9382649984da89e882b25 (diff)
downloadCMake-57f701a7f045fc13807933860bad22fa405c6621.zip
CMake-57f701a7f045fc13807933860bad22fa405c6621.tar.gz
CMake-57f701a7f045fc13807933860bad22fa405c6621.tar.bz2
FindGit: Search in 'Atlassian SourceTree' user directory (#15758)
-rw-r--r--Modules/FindGit.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake
index b4f7b4b..2c3e5fd 100644
--- a/Modules/FindGit.cmake
+++ b/Modules/FindGit.cmake
@@ -48,17 +48,21 @@ if(WIN32)
# GitHub search path for Windows
set(github_path "$ENV{LOCALAPPDATA}/Github/PortableGit*/bin")
file(GLOB github_path "${github_path}")
+ # SourceTree search path for Windows
+ set(_git_sourcetree_path "$ENV{LOCALAPPDATA}/Atlassian/SourceTree/git_local/bin")
endif()
endif()
find_program(GIT_EXECUTABLE
NAMES ${git_names}
- PATHS ${github_path}
+ PATHS ${github_path} ${_git_sourcetree_path}
PATH_SUFFIXES Git/cmd Git/bin
DOC "git command line client"
)
mark_as_advanced(GIT_EXECUTABLE)
+unset(_git_sourcetree_path)
+
if(GIT_EXECUTABLE)
execute_process(COMMAND ${GIT_EXECUTABLE} --version
OUTPUT_VARIABLE git_version