summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-15 09:34:46 -0400
committerBrad King <brad.king@kitware.com>2015-10-15 09:35:43 -0400
commitc9e0173e6fb3ddefb43edaa5235eef2c7b31ad67 (patch)
tree426836894df65bda0f708d8f2972bc5a17850d61
parent4cd52dc5511c8c3809b7cb260ac6afa7eec65f2e (diff)
downloadcmake-c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67.tar.gz
ExternalProject: Always use CMake builtin FindGit (#15791)
Unset CMAKE_MODULE_PATH before calling find_package(Git) to ensure we do not get a project-provided FindGit module that may not provide the GIT_VERSION_STRING that we need. We do not need to restore the value explicitly because this occurs inside the _ep_add_download_command function call scope.
-rw-r--r--Modules/ExternalProject.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index dda45b9dcf..c822bdb973 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1731,6 +1731,7 @@ function(_ep_add_download_command name)
--non-interactive ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name})
list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
elseif(git_repository)
+ unset(CMAKE_MODULE_PATH) # Use CMake builtin find module
find_package(Git QUIET)
if(NOT GIT_EXECUTABLE)
message(FATAL_ERROR "error: could not find git for clone of ${name}")