diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-14 16:42:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-01-14 16:42:20 (GMT) |
| commit | 9cf63886985f39bb364e620e4459252b9ba8072a (patch) | |
| tree | 6b36637c5f089cf38141e50f1aa656b8a843c583 /Help | |
| parent | 6be2dedaedec4d6df7844119d2e4954535d66ad2 (diff) | |
| parent | 630c8aa8435fced988545d396714398faa3426b1 (diff) | |
| download | CMake-9cf63886985f39bb364e620e4459252b9ba8072a.zip CMake-9cf63886985f39bb364e620e4459252b9ba8072a.tar.gz CMake-9cf63886985f39bb364e620e4459252b9ba8072a.tar.bz2 | |
Merge topic 'install-DIRECTORY-genex'
630c8aa8 install: Allow generator expressions in DIRECTORY
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/install.rst | 7 | ||||
| -rw-r--r-- | Help/release/dev/install-DIRECTORY-genex.rst | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Help/command/install.rst b/Help/command/install.rst index 423899e..5d2add7 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -271,9 +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. +The list of ``dirs...`` given to ``DIRECTORY`` and 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-genex.rst b/Help/release/dev/install-DIRECTORY-genex.rst new file mode 100644 index 0000000..e48f19b --- /dev/null +++ b/Help/release/dev/install-DIRECTORY-genex.rst @@ -0,0 +1,6 @@ +install-DIRECTORY-genex +----------------------- + +* The :command:`install(DIRECTORY)` command learned to support + :manual:`generator expressions <cmake-generator-expressions(7)>` + in the list of directories. |