diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-26 15:02:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-26 15:02:09 (GMT) |
| commit | f7b8e674636b037f4b2a8e3398ea8251bfc752dc (patch) | |
| tree | 2a2a77ad2c37aabd61ed937037a075f25c4fbb10 /Help/command | |
| parent | 8a539e7c2fefceefc53006e6be991c107e378a0c (diff) | |
| parent | 2f9c2539614c744092cd46149787440639ce9579 (diff) | |
| download | CMake-f7b8e674636b037f4b2a8e3398ea8251bfc752dc.zip CMake-f7b8e674636b037f4b2a8e3398ea8251bfc752dc.tar.gz CMake-f7b8e674636b037f4b2a8e3398ea8251bfc752dc.tar.bz2 | |
Merge topic 'doc-updates'
2f9c253961 Help: clarify "LINKER:" prefix usage
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2530
Diffstat (limited to 'Help/command')
| -rw-r--r-- | Help/command/LINK_OPTIONS_LINKER.txt | 12 | ||||
| -rw-r--r-- | Help/command/add_link_options.rst | 4 | ||||
| -rw-r--r-- | Help/command/target_link_options.rst | 4 |
3 files changed, 16 insertions, 4 deletions
diff --git a/Help/command/LINK_OPTIONS_LINKER.txt b/Help/command/LINK_OPTIONS_LINKER.txt index 76927be..a723375 100644 --- a/Help/command/LINK_OPTIONS_LINKER.txt +++ b/Help/command/LINK_OPTIONS_LINKER.txt @@ -8,3 +8,15 @@ driver option and the rest of the option string defines linker arguments using For example, ``"LINKER:-z,defs"`` becomes ``-Xlinker -z -Xlinker defs`` for ``Clang`` and ``-Wl,-z,defs`` for ``GNU GCC``. + +The ``LINKER:`` prefix can be specified as part of a ``SHELL:`` prefix +expression. + +The ``LINKER:`` prefix supports, as alternate syntax, specification of +arguments using ``SHELL:`` prefix and space as separator. Previous example +becomes ``"LINKER:SHELL:-z defs"``. + +.. note:: + + Specifying ``SHELL:`` prefix elsewhere than at the beginning of the + ``LINKER:`` prefix is not supported. diff --git a/Help/command/add_link_options.rst b/Help/command/add_link_options.rst index f553848..1b02bee 100644 --- a/Help/command/add_link_options.rst +++ b/Help/command/add_link_options.rst @@ -21,6 +21,6 @@ the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` manual for available expressions. See the :manual:`cmake-buildsystem(7)` manual for more on defining buildsystem properties. -.. include:: LINK_OPTIONS_LINKER.txt - .. include:: OPTIONS_SHELL.txt + +.. include:: LINK_OPTIONS_LINKER.txt diff --git a/Help/command/target_link_options.rst b/Help/command/target_link_options.rst index 0d3c40c..285455a 100644 --- a/Help/command/target_link_options.rst +++ b/Help/command/target_link_options.rst @@ -37,6 +37,6 @@ with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` manual for available expressions. See the :manual:`cmake-buildsystem(7)` manual for more on defining buildsystem properties. -.. include:: LINK_OPTIONS_LINKER.txt - .. include:: OPTIONS_SHELL.txt + +.. include:: LINK_OPTIONS_LINKER.txt |