[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-412-g3d40fcd

[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  3d40fcd01487700b8130d03e0b247bb1fe6ea9d6 (commit)
       via  c95d017f9c221f309a4b74d8a033c1e99e784f90 (commit)
       via  4b21290e204d02dd39f6ac404ba923d546f40925 (commit)
      from  1376688a01bfcf28d31d6a9a79703502d5027ca9 (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=3d40fcd01487700b8130d03e0b247bb1fe6ea9d6
commit 3d40fcd01487700b8130d03e0b247bb1fe6ea9d6
Merge: 1376688 c95d017
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 21 10:33:01 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 21 10:33:01 2017 -0500

    Merge topic 'ExternalProject-update-docs' into next
    
    c95d017f ExternalProject: Clarify documented role of `INSTALL_DIR`
    4b21290e ExternalProject: Clarify documented role of `INSTALL_COMMAND`


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c95d017f9c221f309a4b74d8a033c1e99e784f90
commit c95d017f9c221f309a4b74d8a033c1e99e784f90
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 21 10:31:24 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 21 10:32:26 2017 -0500

    ExternalProject: Clarify documented role of `INSTALL_DIR`
    
    It does not actually configure the project to install to the given
    location.  That must be done by passing the `<INSTALL_DIR>` placeholder
    to the external project configuration step.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 325fbc3..c3fd3c6 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -174,7 +174,10 @@ Create custom targets to build projects in external trees
   Install step options are:
 
   ``INSTALL_DIR <dir>``
-    Installation prefix
+    Installation prefix to be placed in the ``<INSTALL_DIR>`` placeholder.
+    This does not actually configure the external project to install to
+    the given prefix.  That must be done by passing appropriate arguments
+    to the external project configuration step, e.g. using ``<INSTALL_DIR>``.
   ``INSTALL_COMMAND <cmd>...``
     Command to drive installation of the external project after it has been
     built.  This only happens at the *build* time of the calling project.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b21290e204d02dd39f6ac404ba923d546f40925
commit 4b21290e204d02dd39f6ac404ba923d546f40925
Author:     Wilfried Goesgens <willi at arangodb.com>
AuthorDate: Tue Feb 21 15:33:06 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 21 10:32:25 2017 -0500

    ExternalProject: Clarify documented role of `INSTALL_COMMAND`
    
    It is for the install step of the external project and does not
    affect installation of the calling project.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 458c114..325fbc3 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -176,7 +176,11 @@ Create custom targets to build projects in external trees
   ``INSTALL_DIR <dir>``
     Installation prefix
   ``INSTALL_COMMAND <cmd>...``
-    Command to drive install after build
+    Command to drive installation of the external project after it has been
+    built.  This only happens at the *build* time of the calling project.
+    In order to install files from the external project alongside the
+    locally-built files, a separate local :command:`install` call must be
+    added to pick the files up from one of the external project trees.
 
   Test step options are:
 

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

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


hooks/post-receive
-- 
CMake