diff options
author | Brad King <brad.king@kitware.com> | 2023-07-13 12:35:09 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2023-07-13 12:35:16 (GMT) |
commit | c6ce7572984726ac714ae78d31b047683f076e83 (patch) | |
tree | 5a7592dcfa1744a90b08fd216566e4e662328903 | |
parent | 91333f1b993a5f9326f6e2da34edad07f146d300 (diff) | |
parent | 69bc89758fd6eaa508161e1b990a33320ba7bb6f (diff) | |
download | CMake-c6ce7572984726ac714ae78d31b047683f076e83.zip CMake-c6ce7572984726ac714ae78d31b047683f076e83.tar.gz CMake-c6ce7572984726ac714ae78d31b047683f076e83.tar.bz2 |
Merge topic 'doc-genex-TARGET_IMPORT_FILE' into release-3.27
69bc89758f Help: Fix typos, formatting and wording for TARGET_IMPORT_FILE genexes
9c0c844fbd Help: Add TARGET_IMPORT_FILE... genexes to 3.27 release notes
88277d15e7 Help: Add missing versionadded for TARGET_IMPORT_FILE_DIR genex
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8625
-rw-r--r-- | Help/manual/cmake-generator-expressions.7.rst | 26 | ||||
-rw-r--r-- | Help/release/3.27.rst | 6 |
2 files changed, 20 insertions, 12 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index 473e8d7..981bd90 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -1789,20 +1789,20 @@ In the following, the phrase "the ``tgt`` filename" means the name of the .. versionadded:: 3.27 Full path to the linker import file. On DLL platforms, it would be the - ``.lib`` file. On AIX, for the executables, and on macOS, for the shared - libraries, it could be, respectively, the ``.imp`` or ``.tbd`` import file, - depending of the value of :prop_tgt:`ENABLE_EXPORTS` property. + ``.lib`` file. For executables on AIX, and for shared libraries on macOS, + it could be, respectively, the ``.imp`` or ``.tbd`` import file, + depending on the value of the :prop_tgt:`ENABLE_EXPORTS` property. - An empty string is returned when there is no import file associated with the - target. + This expands to an empty string when there is no import file associated + with the target. .. genex:: $<TARGET_IMPORT_FILE_BASE_NAME:tgt> .. versionadded:: 3.27 - Base name of file linker import file of the target ``tgt`` without prefix and - suffix. For example, if target file name is ``libbase.tbd``, the base name is - ``base``. + Base name of the linker import file of the target ``tgt`` without prefix or + suffix. For example, if the target file name is ``libbase.tbd``, the base + name is ``base``. See also the :prop_tgt:`OUTPUT_NAME` and :prop_tgt:`ARCHIVE_OUTPUT_NAME` target properties and their configuration specific variants @@ -1831,7 +1831,7 @@ In the following, the phrase "the ``tgt`` filename" means the name of the Suffix of the import file of the target ``tgt``. - The suffix corresponds to the file extension (such as ".lib" or ".tbd"). + The suffix corresponds to the file extension (such as ``.lib`` or ``.tbd``). See also the :prop_tgt:`IMPORT_SUFFIX` target property. @@ -1842,13 +1842,15 @@ In the following, the phrase "the ``tgt`` filename" means the name of the .. versionadded:: 3.27 - Name of the import file of the target target ``tgt``. + Name of the import file of the target ``tgt``. Note that ``tgt`` is not added as a dependency of the target this expression is evaluated on. .. genex:: $<TARGET_IMPORT_FILE_DIR:tgt> + .. versionadded:: 3.27 + Directory of the import file of the target ``tgt``. Note that ``tgt`` is not added as a dependency of the target this @@ -1863,11 +1865,11 @@ In the following, the phrase "the ``tgt`` filename" means the name of the .. versionadded:: 3.27 On macOS, it could be the ``.tbd`` import file associated with the shared - library, depending of the value of :prop_tgt:`ENABLE_EXPORTS` property. + library, depending on the value of the :prop_tgt:`ENABLE_EXPORTS` property. This generator expression is equivalent to :genex:`$<TARGET_LINKER_LIBRARY_FILE>` or - :genex:`$<TARGET_LINKER_IMPORT_FILE>` generator expressions, depending of the + :genex:`$<TARGET_LINKER_IMPORT_FILE>` generator expressions, depending on the characteristics of the target and the platform. .. genex:: $<TARGET_LINKER_FILE_BASE_NAME:tgt> diff --git a/Help/release/3.27.rst b/Help/release/3.27.rst index 930a0dc..52768d1 100644 --- a/Help/release/3.27.rst +++ b/Help/release/3.27.rst @@ -157,6 +157,12 @@ Generator Expressions :ref:`transformation <GenEx Path Transformations>` operations learned to process :ref:`lists <CMake Language Lists>` of paths element-wise. +* The :genex:`TARGET_IMPORT_FILE`, :genex:`TARGET_IMPORT_FILE_BASE_NAME`, + :genex:`TARGET_IMPORT_FILE_PREFIX`, :genex:`TARGET_IMPORT_FILE_SUFFIX`, + :genex:`TARGET_IMPORT_FILE_NAME`, and :genex:`TARGET_IMPORT_FILE_DIR` + generator expressions were added. These expand to details about the + linker import file for a target. + * The :genex:`TARGET_RUNTIME_DLL_DIRS` generator expression was added. It expands to a list of the directories containing DLLs in :genex:`TARGET_RUNTIME_DLLS`. |