[Cmake-commits] CMake branch, next, updated. v2.8.8-2664-gcfc532f
David Cole
david.cole at kitware.com
Sun Apr 22 10:34:42 EDT 2012
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 cfc532f46abca50d2009564037cbbcad23aa4266 (commit)
via 64818c107737ad1bc5ee57a0ddeac1fc1e945faf (commit)
via 3a503926018fd10ef2120e2c1b98e93afb4fd0c1 (commit)
from b65906cbd789373a7270f04bcf81bdfcaf328a14 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfc532f46abca50d2009564037cbbcad23aa4266
commit cfc532f46abca50d2009564037cbbcad23aa4266
Merge: b65906c 64818c1
Author: David Cole <david.cole at kitware.com>
AuthorDate: Sun Apr 22 10:34:27 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Apr 22 10:34:27 2012 -0400
Merge topic 'fix-ExternalProject-COMMAND-niggly' into next
64818c1 ExternalProject: Add missing COMMAND keyword
3a50392 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64818c107737ad1bc5ee57a0ddeac1fc1e945faf
commit 64818c107737ad1bc5ee57a0ddeac1fc1e945faf
Author: David Cole <david.cole at kitware.com>
AuthorDate: Sun Apr 22 09:10:01 2012 -0400
Commit: David Cole <david.cole at kitware.com>
CommitDate: Sun Apr 22 09:10:01 2012 -0400
ExternalProject: Add missing COMMAND keyword
Commit f67139ae added running a verify script in between running
the download and extract scripts. Since then, it has always been
missing the COMMAND keyword added in this commit.
It worked anyway (semi-accidentally) by running a command line like:
cmake -P script1.cmake cmake -P script2.cmake
CMake, when running -P scripts on the command line, runs them in order,
and apparently ignores spurious arguments in between (the middle "cmake"
in the above example) and so, all appeared to work as intended.
This commit adds the missing keyword and the commands that run are
now two separate sequential cmake invocations like:
cmake -P script1.cmake
cmake -P script2.cmake
...which was the original intent of commit f67139ae
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index b6fe190..301d1fc 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1141,7 +1141,8 @@ function(_ep_add_download_command name)
set(comment "Performing download step (verify and extract) for '${name}'")
endif()
_ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${md5}")
- list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake)
+ list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake
+ COMMAND)
_ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${name}" "${file}" "${source_dir}")
list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake)
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/ExternalProject.cmake | 3 ++-
Source/CMakeVersion.cmake | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list