diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-16 13:35:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-16 13:35:39 (GMT) |
| commit | 02f8d51f48ae4abfec5491a8ab47be35a6671bab (patch) | |
| tree | 50052d3445267892918575cd2a7f7cbaa33c01b4 /Modules | |
| parent | dfd371dc013f14fb8e52c4f16e4a0f03a1ead9ce (diff) | |
| parent | c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67 (diff) | |
| download | CMake-02f8d51f48ae4abfec5491a8ab47be35a6671bab.zip CMake-02f8d51f48ae4abfec5491a8ab47be35a6671bab.tar.gz CMake-02f8d51f48ae4abfec5491a8ab47be35a6671bab.tar.bz2 | |
Merge topic 'ExternalProject-fix-git-version'
c9e0173e ExternalProject: Always use CMake builtin FindGit (#15791)
4cd52dc5 ExternalProject: Fix Git version report in error message (#15791)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 90ceedf..c822bdb 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}") @@ -1739,7 +1740,7 @@ function(_ep_add_download_command name) # The git submodule update '--recursive' flag requires git >= v1.6.5 # if(GIT_VERSION_STRING VERSION_LESS 1.6.5) - message(FATAL_ERROR "error: git version 1.6.5 or later required for 'git submodule update --recursive': git_version='${git_version}'") + message(FATAL_ERROR "error: git version 1.6.5 or later required for 'git submodule update --recursive': GIT_VERSION_STRING='${GIT_VERSION_STRING}'") endif() get_property(git_tag TARGET ${name} PROPERTY _EP_GIT_TAG) |