diff options
| author | Cristian Le <git@lecris.dev> | 2023-12-27 18:15:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-02-21 18:47:08 (GMT) |
| commit | 1a38ffc656351a177586a8037504c54125b8476a (patch) | |
| tree | 5380ac475793decdedc5811c8a4ff26700049334 /Help/manual | |
| parent | 821a43b1d40d6608894101bbf9cce59c3b382414 (diff) | |
| download | CMake-1a38ffc656351a177586a8037504c54125b8476a.zip CMake-1a38ffc656351a177586a8037504c54125b8476a.tar.gz CMake-1a38ffc656351a177586a8037504c54125b8476a.tar.bz2 | |
presets: Expand more macros in the `include` directive
Signed-off-by: Cristian Le <cristian.le@mpsd.mpg.de>
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 7 | ||||
| -rw-r--r-- | Help/manual/presets/schema.json | 18 |
2 files changed, 24 insertions, 1 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index fc0e1f9..5e91ae5 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -78,6 +78,9 @@ The root object recognizes the following fields: ``8`` .. versionadded:: 3.28 + ``9`` + .. versionadded:: 3.30 + ``cmakeMinimumRequired`` An optional object representing the minimum version of CMake needed to build this project. This object consists of the following fields: @@ -146,7 +149,9 @@ guaranteed to be provided by the project. ``CMakeUserPresets.json`` may include files from anywhere. Starting from version ``7``, the ``include`` field supports -`macro expansion`_, but only ``$penv{}`` macro expansion. +`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{}``. Configure Preset ^^^^^^^^^^^^^^^^ diff --git a/Help/manual/presets/schema.json b/Help/manual/presets/schema.json index d27faa1..f80685c 100644 --- a/Help/manual/presets/schema.json +++ b/Help/manual/presets/schema.json @@ -124,6 +124,24 @@ "include": { "$ref": "#/definitions/include" } }, "additionalProperties": false + }, + { + "properties": { + "$schema": { "$ref": "#/definitions/$schema" }, + "version": { + "const": 9, + "description": "A required integer representing the version of the JSON schema." + }, + "cmakeMinimumRequired": { "$ref": "#/definitions/cmakeMinimumRequired" }, + "vendor": { "$ref": "#/definitions/vendor" }, + "configurePresets": { "$ref": "#/definitions/configurePresetsV7" }, + "buildPresets": { "$ref": "#/definitions/buildPresetsV4" }, + "testPresets": { "$ref": "#/definitions/testPresetsV6" }, + "packagePresets": { "$ref": "#/definitions/packagePresetsV6" }, + "workflowPresets": { "$ref": "#/definitions/workflowPresetsV6" }, + "include": { "$ref": "#/definitions/include" } + }, + "additionalProperties": false } ], "required": [ |