diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-13 12:41:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-13 12:41:24 (GMT) |
| commit | ff5188481a43f024db0e8ac385eed398be401d90 (patch) | |
| tree | a8cad2fa93773d64dc9abb592c50b63ab47d9e28 | |
| parent | ac59ec7dc19fe4bfcab81169d6f597c4852f096e (diff) | |
| parent | c4d481e5b8558ac00e637b36312685762a82bb23 (diff) | |
| download | CMake-ff5188481a43f024db0e8ac385eed398be401d90.zip CMake-ff5188481a43f024db0e8ac385eed398be401d90.tar.gz CMake-ff5188481a43f024db0e8ac385eed398be401d90.tar.bz2 | |
Merge topic 'FindGit-avoid-vs-2017-git'
c4d481e5 FindGit: Avoid finding VS 2017 non-general Git installation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !575
| -rw-r--r-- | Modules/FindGit.cmake | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Modules/FindGit.cmake b/Modules/FindGit.cmake index b830c08..fae31eb 100644 --- a/Modules/FindGit.cmake +++ b/Modules/FindGit.cmake @@ -43,12 +43,26 @@ if(CMAKE_HOST_WIN32) endif() endif() +# First search the PATH and specific locations. find_program(GIT_EXECUTABLE NAMES ${git_names} PATHS ${github_path} ${_git_sourcetree_path} - PATH_SUFFIXES Git/cmd Git/bin DOC "Git command line client" ) + +if(CMAKE_HOST_WIN32) + # Now look for installations in Git/ directories under typical installation + # prefixes on Windows. Exclude PATH from this search because VS 2017's + # command prompt happens to have a PATH entry with a Git/ subdirectory + # containing a minimal git not meant for general use. + find_program(GIT_EXECUTABLE + NAMES ${git_names} + PATH_SUFFIXES Git/cmd Git/bin + NO_SYSTEM_ENVIRONMENT_PATH + DOC "Git command line client" + ) +endif() + mark_as_advanced(GIT_EXECUTABLE) unset(git_names) |