summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-11-08 15:32:49 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-11-08 15:33:46 (GMT)
commit31a4d82def4861ed6731d2a5dab9771918c35735 (patch)
tree33b6974add6eb22f0283d032918a2cefdeb1507a
parent5eb3570a77fbe9866ea269d28bb07de47ebb9971 (diff)
parentae72b04418869b418dcfc21a150ea467050c5489 (diff)
downloadCMake-31a4d82def4861ed6731d2a5dab9771918c35735.zip
CMake-31a4d82def4861ed6731d2a5dab9771918c35735.tar.gz
CMake-31a4d82def4861ed6731d2a5dab9771918c35735.tar.bz2
Merge topic 'doc-genex-compiler-ids'
ae72b04418 Help: Document when <LANG>_COMPILER_ID genex learned to support multiple ids Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8952
-rw-r--r--Help/manual/cmake-generator-expressions.7.rst12
1 files changed, 12 insertions, 0 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index d4a43de..3e58b31 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -1053,6 +1053,10 @@ related to most of the expressions in this sub-section.
``1`` if CMake's compiler id of the C compiler matches any one
of the entries in ``compiler_ids``, otherwise ``0``.
+ .. versionchanged:: 3.15
+ Multiple ``compiler_ids`` can be specified.
+ CMake 3.14 and earlier only accepted a single compiler ID.
+
.. genex:: $<CXX_COMPILER_ID>
CMake's compiler id of the CXX compiler used.
@@ -1063,6 +1067,10 @@ related to most of the expressions in this sub-section.
``1`` if CMake's compiler id of the CXX compiler matches any one
of the entries in ``compiler_ids``, otherwise ``0``.
+ .. versionchanged:: 3.15
+ Multiple ``compiler_ids`` can be specified.
+ CMake 3.14 and earlier only accepted a single compiler ID.
+
.. genex:: $<CUDA_COMPILER_ID>
.. versionadded:: 3.15
@@ -1115,6 +1123,10 @@ related to most of the expressions in this sub-section.
``1`` if CMake's compiler id of the Fortran compiler matches any one
of the entries in ``compiler_ids``, otherwise ``0``.
+ .. versionchanged:: 3.15
+ Multiple ``compiler_ids`` can be specified.
+ CMake 3.14 and earlier only accepted a single compiler ID.
+
.. genex:: $<HIP_COMPILER_ID>
.. versionadded:: 3.21