diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-30 14:09:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-30 14:09:52 (GMT) |
| commit | d0e6fc28334023a42fbae797ece8c8e8526dc1c3 (patch) | |
| tree | abdba82e756e6aa8545b758f8ce908a67f89ad7b /Help | |
| parent | 60515b205e0151fa0194a984850e652a04a9a165 (diff) | |
| parent | ce078dda79df1c8d9f142e45d2fa3cf971a09594 (diff) | |
| download | CMake-d0e6fc28334023a42fbae797ece8c8e8526dc1c3.zip CMake-d0e6fc28334023a42fbae797ece8c8e8526dc1c3.tar.gz CMake-d0e6fc28334023a42fbae797ece8c8e8526dc1c3.tar.bz2 | |
Merge topic 'relax_TARGET_OBJECT_generator_expr'
ce078dda79 Relax the usage of TARGET_OBJECTS generator expression
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3178
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-generator-expressions.7.rst | 3 | ||||
| -rw-r--r-- | Help/release/dev/relax-TARGET_OBJECTS-generator-expression.rst | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 7f4761f..3dc3221 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -530,8 +530,7 @@ Output-Related Expressions Content of ``...`` converted to a C identifier. The conversion follows the same behavior as :command:`string(MAKE_C_IDENTIFIER)`. ``$<TARGET_OBJECTS:objLib>`` - List of objects resulting from build of ``objLib``. ``objLib`` must be an - object of type ``OBJECT_LIBRARY``. + List of objects resulting from build of ``objLib``. ``$<SHELL_PATH:...>`` Content of ``...`` converted to shell path style. For example, slashes are converted to backslashes in Windows shells and drive letters are converted diff --git a/Help/release/dev/relax-TARGET_OBJECTS-generator-expression.rst b/Help/release/dev/relax-TARGET_OBJECTS-generator-expression.rst new file mode 100644 index 0000000..25ca0c9 --- /dev/null +++ b/Help/release/dev/relax-TARGET_OBJECTS-generator-expression.rst @@ -0,0 +1,5 @@ +relax-TARGET_OBJECTS-generator-expression +----------------------------------------- + +* The ``TARGET_OBJECTS`` :manual:`generator expression <cmake-generator-expressions(7)>` + is now supported on ``SHARED``, ``STATIC``, ``MODULE`` libraries and executables. |