summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-09-24 14:28:54 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-09-24 14:28:54 (GMT)
commitcbfae8c3f2c971441d4943a630efe7b186ee0c44 (patch)
tree29a43d661df7cf923266855c174e1b774d90ac7e /Help
parent02ccef2ae586ce342cb76eaec61db0e2132081a4 (diff)
parent69ab5f55026c7e884a70f04aa7ddef776f74305b (diff)
downloadCMake-cbfae8c3f2c971441d4943a630efe7b186ee0c44.zip
CMake-cbfae8c3f2c971441d4943a630efe7b186ee0c44.tar.gz
CMake-cbfae8c3f2c971441d4943a630efe7b186ee0c44.tar.bz2
Merge topic 'install-files-dest-genex'
69ab5f55 Tests: Cover install(FILES) with a genex DESTINATION 17aa6fd3 install: Allow generator expressions in FILES DESTINATION
Diffstat (limited to 'Help')
-rw-r--r--Help/command/install.rst4
-rw-r--r--Help/release/dev/install-files-dest-genex.rst5
2 files changed, 9 insertions, 0 deletions
diff --git a/Help/command/install.rst b/Help/command/install.rst
index c99ed73..9c17bba 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -192,6 +192,10 @@ The list of ``files...`` given to ``FILES`` or ``PROGRAMS`` may use
However, if any item begins in a generator expression it must evaluate
to a full path.
+The install destination given to the files install ``DESTINATION`` may
+use "generator expressions" with the syntax ``$<...>``. See the
+:manual:`cmake-generator-expressions(7)` manual for available expressions.
+
Installing Directories
^^^^^^^^^^^^^^^^^^^^^^
diff --git a/Help/release/dev/install-files-dest-genex.rst b/Help/release/dev/install-files-dest-genex.rst
new file mode 100644
index 0000000..b7aa8b3
--- /dev/null
+++ b/Help/release/dev/install-files-dest-genex.rst
@@ -0,0 +1,5 @@
+install-files-dest-genex
+------------------------
+
+* The :command:`install(FILES)` command ``DESTINATION`` option learned to
+ support :manual:`generator expressions <cmake-generator-expressions(7)>`.