[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-576-g1c7f65b

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  1c7f65b28d6b12a4a3f7bf0dca56fb4ef4fcf386 (commit)
       via  c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67 (commit)
      from  c9ede510ec479901208d986e35fc50f47c6ace00 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c7f65b28d6b12a4a3f7bf0dca56fb4ef4fcf386
commit 1c7f65b28d6b12a4a3f7bf0dca56fb4ef4fcf386
Merge: c9ede51 c9e0173
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 09:39:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 15 09:39:34 2015 -0400

    Merge topic 'ExternalProject-fix-git-version' into next
    
    c9e0173e ExternalProject: Always use CMake builtin FindGit (#15791)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67
commit c9e0173e6fb3ddefb43edaa5235eef2c7b31ad67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 09:34:46 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 15 09:35:43 2015 -0400

    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.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index dda45b9..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}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake