summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-02-21 16:11:27 (GMT)
committerBrad King <brad.king@kitware.com>2017-02-21 16:11:27 (GMT)
commitfe8f5b54f561de6fa8fed1186aa7ef3ce721b7d9 (patch)
tree90f7f1f716c38b522fc85f7a2d9803a4a5422e45
parent0f6ebb5c0fac9def6d7388e55960b92ab8f2644f (diff)
parentc95d017f9c221f309a4b74d8a033c1e99e784f90 (diff)
downloadCMake-fe8f5b54f561de6fa8fed1186aa7ef3ce721b7d9.zip
CMake-fe8f5b54f561de6fa8fed1186aa7ef3ce721b7d9.tar.gz
CMake-fe8f5b54f561de6fa8fed1186aa7ef3ce721b7d9.tar.bz2
Merge branch 'ExternalProject-update-docs' into release
-rw-r--r--Modules/ExternalProject.cmake11
1 files changed, 9 insertions, 2 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 458c114..c3fd3c6 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -174,9 +174,16 @@ 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 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: