summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorChristian Fetzer <fetzer.ch@gmail.com>2016-05-21 09:34:04 (GMT)
committerChristian Fetzer <fetzer.ch@gmail.com>2016-05-21 09:41:34 (GMT)
commit2bc981e669087a489dec9ee4a62b447c3743bb79 (patch)
tree138d84f340b5ac5800c68894c2bb846c2e80ecde /Modules
parent24391d9f7668499652c85f6cc8932eb474a194ae (diff)
downloadCMake-2bc981e669087a489dec9ee4a62b447c3743bb79.zip
CMake-2bc981e669087a489dec9ee4a62b447c3743bb79.tar.gz
CMake-2bc981e669087a489dec9ee4a62b447c3743bb79.tar.bz2
ExternalProject: Fix git stash not using "--all" option
GIT_VERSION_STRING is unset in _ep_write_gitupdate_script(), hence git stash is not being called with the "--all" option, even if Git is new enough to support this.
Diffstat (limited to 'Modules')
-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()