summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-21 21:47:34 (GMT)
committerBrad King <brad.king@kitware.com>2014-02-21 22:05:26 (GMT)
commit6e89c8a5f1d5aa9bffa95be2b1add8d2c4e55026 (patch)
treecc732c0ab42e7435005ac0c51f71b765f28b828e /Help
parentf11f7b34a8e77c3bd68578f00b57e0884cb0d872 (diff)
downloadCMake-6e89c8a5f1d5aa9bffa95be2b1add8d2c4e55026.zip
CMake-6e89c8a5f1d5aa9bffa95be2b1add8d2c4e55026.tar.gz
CMake-6e89c8a5f1d5aa9bffa95be2b1add8d2c4e55026.tar.bz2
install: Support generator expressions in FILES and PROGRAMS mode
Teach the install(FILES) and install(PROGRAMS) commands to evaluate generator expressions in the list of files. Extend the ExportImport test to cover installation cases involving generator expressions.
Diffstat (limited to 'Help')
-rw-r--r--Help/command/install.rst6
-rw-r--r--Help/release/3.0.0.rst4
2 files changed, 10 insertions, 0 deletions
diff --git a/Help/command/install.rst b/Help/command/install.rst
index ebc95d7..47108f0 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -169,6 +169,12 @@ default permissions for the installed file also include ``OWNER_EXECUTE``,
programs that are not targets, such as shell scripts. Use the ``TARGETS``
form to install targets built within the project.
+The list of ``files...`` given to ``FILES`` or ``PROGRAMS`` may use
+"generator expressions" with the syntax ``$<...>``. See the
+:manual:`cmake-generator-expressions(7)` manual for available expressions.
+However, if any item begins in a generator expression it must evaluate
+to a full path.
+
------------------------------------------------------------------------------
::
diff --git a/Help/release/3.0.0.rst b/Help/release/3.0.0.rst
index 105d651..677c7a8 100644
--- a/Help/release/3.0.0.rst
+++ b/Help/release/3.0.0.rst
@@ -102,6 +102,10 @@ Commands
configuration because it will not be available.
Use :ref:`Alias Targets` instead. See policy :policy:`CMP0024`.
+* The :command:`install(FILES)` command learned to support
+ :manual:`generator expressions <cmake-generator-expressions(7)>`
+ in the list of files.
+
* The :command:`project` command learned to set some version variables
to values specified by the new ``VERSION`` option or to empty strings.
See policy :policy:`CMP0048`.