summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-06-06 13:36:31 (GMT)
committerKitware Robot <kwrobot@kitware.com>2024-06-06 13:36:48 (GMT)
commit29390cd23193be3464d9151f91cd14f5b050b269 (patch)
tree1ee09a9b211123914058490f92a10201837644a8 /Help
parentb737219f35132df26f4cd47a5fe3802c63615db3 (diff)
parent1ea780ea7ca6fa9eda471af14533eec38476b4a7 (diff)
downloadCMake-29390cd23193be3464d9151f91cd14f5b050b269.zip
CMake-29390cd23193be3464d9151f91cd14f5b050b269.tar.gz
CMake-29390cd23193be3464d9151f91cd14f5b050b269.tar.bz2
Merge topic 'doc-preset-specific-macros' into release-3.30
1ea780ea7c Help: Clarify preset-specific macros Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9587
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-presets.7.rst9
-rw-r--r--Help/release/3.30.rst3
2 files changed, 9 insertions, 3 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst
index 5e91ae5..59b34c6 100644
--- a/Help/manual/cmake-presets.7.rst
+++ b/Help/manual/cmake-presets.7.rst
@@ -150,8 +150,9 @@ include files from anywhere.
Starting from version ``7``, the ``include`` field supports
`macro expansion`_, but only ``$penv{}`` macro expansion. Starting from version
-``9``, other macro expansions are also available, except for preset specific
-ones (e.g. ``presetName``), and ``$env{}``.
+``9``, other macro expansions are also available, except for ``$env{}`` and
+preset-specific macros, i.e., those derived from the fields inside a preset's
+definition like ``presetName``.
Configure Preset
^^^^^^^^^^^^^^^^
@@ -1217,11 +1218,15 @@ Recognized macros include:
``${presetName}``
Name specified in the preset's ``name`` field.
+ This is a preset-specific macro.
+
``${generator}``
Generator specified in the preset's ``generator`` field. For build and
test presets, this will evaluate to the generator specified by
``configurePreset``.
+ This is a preset-specific macro.
+
``${hostSystemName}``
The name of the host operating system. Contains the same value as
:variable:`CMAKE_HOST_SYSTEM_NAME`. This is allowed in preset files
diff --git a/Help/release/3.30.rst b/Help/release/3.30.rst
index a9273b6..8c8bb85 100644
--- a/Help/release/3.30.rst
+++ b/Help/release/3.30.rst
@@ -15,7 +15,8 @@ Presets
* :manual:`cmake-presets(7)` files now support schema version ``9``.
``include`` fields now expand all macros except ``$env{}`` and
- preset-specific macros.
+ preset-specific macros, i.e., those derived from the fields
+ inside a preset's definition.
File-Based API
--------------