[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-574-gc9ede51

[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  c9ede510ec479901208d986e35fc50f47c6ace00 (commit)
       via  4cd52dc5511c8c3809b7cb260ac6afa7eec65f2e (commit)
      from  450543241dc814f5035c13b49b2d763903b2fcd8 (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=c9ede510ec479901208d986e35fc50f47c6ace00
commit c9ede510ec479901208d986e35fc50f47c6ace00
Merge: 4505432 4cd52dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 09:05:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 15 09:05:41 2015 -0400

    Merge topic 'ExternalProject-fix-git-version-error' into next
    
    4cd52dc5 ExternalProject: Fix Git version report in error message (#15791)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cd52dc5511c8c3809b7cb260ac6afa7eec65f2e
commit 4cd52dc5511c8c3809b7cb260ac6afa7eec65f2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 15 08:56:53 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 15 09:00:23 2015 -0400

    ExternalProject: Fix Git version report in error message (#15791)
    
    Refactoring in commit v3.4.0-rc1~77^2~1 (ExternalProject: Use
    GIT_VERSION_STRING instead of custom method, 2015-09-17) forgot
    to update the variable name used in an error message.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 90ceedf..dda45b9 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1739,7 +1739,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)

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

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


hooks/post-receive
-- 
CMake