summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-09-25 14:12:40 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-09-25 14:12:40 (GMT)
commit5a83303f50e7eadddae9bad0d13a7f751f733136 (patch)
tree42733a2a62d1f570c024b538ece5c05a81c9875a /Help
parent910ea2100425289ec4f13327141b5c45ede320bd (diff)
parentbd189cc24e2292ab80dde7c0d0ac1cd9fafb2d35 (diff)
downloadCMake-5a83303f50e7eadddae9bad0d13a7f751f733136.zip
CMake-5a83303f50e7eadddae9bad0d13a7f751f733136.tar.gz
CMake-5a83303f50e7eadddae9bad0d13a7f751f733136.tar.bz2
Merge topic 'install-directory-dest-genex'
bd189cc2 install: Allow generator expressions in DIRECTORY DESTINATION
Diffstat (limited to 'Help')
-rw-r--r--Help/command/install.rst4
-rw-r--r--Help/release/dev/install-directory-dest-genex.rst5
2 files changed, 9 insertions, 0 deletions
diff --git a/Help/command/install.rst b/Help/command/install.rst
index 9c17bba..423899e 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -271,6 +271,10 @@ will install the ``icons`` directory to ``share/myproj/icons`` and the
file permissions, the scripts will be given specific permissions, and any
``CVS`` directories will be excluded.
+The install destination given to the directory install ``DESTINATION`` may
+use "generator expressions" with the syntax ``$<...>``. See the
+:manual:`cmake-generator-expressions(7)` manual for available expressions.
+
Custom Installation Logic
^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/Help/release/dev/install-directory-dest-genex.rst b/Help/release/dev/install-directory-dest-genex.rst
new file mode 100644
index 0000000..2b83bbd
--- /dev/null
+++ b/Help/release/dev/install-directory-dest-genex.rst
@@ -0,0 +1,5 @@
+install-directory-dest-genex
+----------------------------
+
+* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
+ support :manual:`generator expressions <cmake-generator-expressions(7)>`.