summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-05-24 17:53:58 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-05-24 17:53:58 (GMT)
commit185be83815228fd25ab568757d5a9f3286ae01c0 (patch)
tree774393d12c0a7c0078d6115c5b48bb284ce97524
parent7d5355a21ad551ecd6fefd2f7a2beaaa3ac1f0e3 (diff)
parent2bc981e669087a489dec9ee4a62b447c3743bb79 (diff)
downloadCMake-185be83815228fd25ab568757d5a9f3286ae01c0.zip
CMake-185be83815228fd25ab568757d5a9f3286ae01c0.tar.gz
CMake-185be83815228fd25ab568757d5a9f3286ae01c0.tar.bz2
Merge topic 'ExternalProject-fix-stash-all'
2bc981e6 ExternalProject: Fix git stash not using "--all" option
-rw-r--r--Modules/ExternalProject.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index ad6de18..2ff18fc 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -2021,6 +2021,8 @@ function(_ep_add_update_command name)
--non-interactive ${svn_trust_cert_args} ${svn_user_pw_args})
set(always 1)
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 fetch of ${name}")
endif()