[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2961-ge9f47d0

[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  e9f47d0353da6132698b5d383422216287bc7971 (commit)
       via  41f7e3079fc2c509b36b6613a240b08d52f87424 (commit)
      from  c464c1c94fe6947d3217c6bfa93b50230f3914be (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=e9f47d0353da6132698b5d383422216287bc7971
commit e9f47d0353da6132698b5d383422216287bc7971
Merge: c464c1c 41f7e30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 8 11:43:53 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 8 11:43:53 2013 -0400

    Merge topic 'doc-ExternalProject-COMMAND-keyword' into next
    
    41f7e30 ExternalProject: Document multiple COMMAND lines


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41f7e3079fc2c509b36b6613a240b08d52f87424
commit 41f7e3079fc2c509b36b6613a240b08d52f87424
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 8 11:35:56 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 8 11:39:46 2013 -0400

    ExternalProject: Document multiple COMMAND lines
    
    We support multiple commands per external project step by using
    the COMMAND keyword.  Document this behavior and show an example.
    While at it, document that shell operators and current working
    directory behavior is not defined.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 6afdb97..b2b0df5 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -114,6 +114,15 @@
 # and <TMP_DIR>
 # with corresponding property values.
 #
+# Any builtin step that specifies a "<step>_COMMAND cmd..." or custom
+# step that specifies a "COMMAND cmd..." may specify additional command
+# lines using the form "COMMAND cmd...".  At build time the commands will
+# be executed in order and aborted if any one fails.  For example:
+#  ExternalProject_Add(... BUILD_COMMAND make COMMAND echo done ...)
+# specifies to run "make" and then "echo done" during the build step.
+# Whether the current working directory is preserved between commands
+# is not defined.  Behavior of shell operators like "&&" is not defined.
+#
 # The 'ExternalProject_Get_Property' function retrieves external project
 # target properties:
 #  ExternalProject_Get_Property(<name> [prop1 [prop2 [...]]])

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

Summary of changes:
 Modules/ExternalProject.cmake |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake