diff options
author | Brad King <brad.king@kitware.com> | 2022-03-07 15:03:48 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-03-07 15:04:13 (GMT) |
commit | 49642079e5d13e82444da23ce8ae4fdee4daaa30 (patch) | |
tree | f0afdd8a29284f7536398402376388f83774a268 /Help/manual | |
parent | 7e807479ffa2691d09eeae6e51322f34672dbef8 (diff) | |
parent | 9fb1dff0708792ba275fa841459d6d3875613cfa (diff) | |
download | CMake-49642079e5d13e82444da23ce8ae4fdee4daaa30.zip CMake-49642079e5d13e82444da23ce8ae4fdee4daaa30.tar.gz CMake-49642079e5d13e82444da23ce8ae4fdee4daaa30.tar.bz2 |
Merge topic 'LINK_LIBRARY-libraries'
9fb1dff070 LINK_LIBRARY: Add features for library support on Apple
93a153bc7f Genx-LINK_LIBRARY: simplify framework features definitions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7029
Diffstat (limited to 'Help/manual')
-rw-r--r-- | Help/manual/cmake-generator-expressions.7.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 0ab4bc2..2394eb2 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -1157,7 +1157,7 @@ Output-Related Expressions expression. The ``library-list`` argument can hold CMake targets or external libraries. - Any ``CMake`` target of type :ref:`OBJECT <Object Libraries>` or + Any CMake target of type :ref:`OBJECT <Object Libraries>` or :ref:`INTERFACE <Interface Libraries>` will be ignored by this expression and will be handled in the standard way. @@ -1187,7 +1187,7 @@ Output-Related Expressions ``end-group``, as supported by ``GNU ld``, the :genex:`LINK_GROUP` generator expression can be used. - ``CMake`` pre-defines some features of general interest: + CMake pre-defines some features of general interest: .. include:: ../variable/LINK_LIBRARY_PREDEFINED_FEATURES.txt |