diff options
| author | Frank Winklmeier <frank.winklmeier@cern.ch> | 2022-02-28 09:13:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-08 13:18:02 (GMT) |
| commit | 359e5b17d8edd092a1e500698af7968f96fe1d8d (patch) | |
| tree | 85ef0b866a6da03e157ebbbc7b4746af74038b31 /Help/manual | |
| parent | 4634de335bdf2c23659e84195ededc4ef4702ba4 (diff) | |
| download | CMake-359e5b17d8edd092a1e500698af7968f96fe1d8d.zip CMake-359e5b17d8edd092a1e500698af7968f96fe1d8d.tar.gz CMake-359e5b17d8edd092a1e500698af7968f96fe1d8d.tar.bz2 | |
presets: bump version to v5
Prepare for new test preset fields.
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 2 | ||||
| -rw-r--r-- | Help/manual/presets/example.json | 2 | ||||
| -rw-r--r-- | Help/manual/presets/schema.json | 50 |
3 files changed, 50 insertions, 4 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index 31bd9c0..23057b9 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -54,7 +54,7 @@ The root object recognizes the following fields: ``version`` A required integer representing the version of the JSON schema. - The supported versions are ``1``, ``2``, ``3``, and ``4``. + The supported versions are ``1``, ``2``, ``3``, ``4``, and ``5``. ``cmakeMinimumRequired`` diff --git a/Help/manual/presets/example.json b/Help/manual/presets/example.json index a7ec10e..9365c87 100644 --- a/Help/manual/presets/example.json +++ b/Help/manual/presets/example.json @@ -1,5 +1,5 @@ { - "version": 4, + "version": 5, "cmakeMinimumRequired": { "major": 3, "minor": 21, diff --git a/Help/manual/presets/schema.json b/Help/manual/presets/schema.json index 12f8b5e..ac7b1dd 100644 --- a/Help/manual/presets/schema.json +++ b/Help/manual/presets/schema.json @@ -57,6 +57,21 @@ "include": { "$ref": "#/definitions/include"} }, "additionalProperties": false + }, + { + "properties": { + "version": { + "const": 5, + "description": "A required integer representing the version of the JSON schema." + }, + "cmakeMinimumRequired": { "$ref": "#/definitions/cmakeMinimumRequired"}, + "vendor": { "$ref": "#/definitions/vendor" }, + "configurePresets": { "$ref": "#/definitions/configurePresetsV3"}, + "buildPresets": { "$ref": "#/definitions/buildPresetsV4"}, + "testPresets": { "$ref": "#/definitions/testPresetsV5"}, + "include": { "$ref": "#/definitions/include"} + }, + "additionalProperties": false } ], "required": [ @@ -821,8 +836,7 @@ "type": "integer", "description": "An optional integer specifying the maximum width of a test name to output. Equivalent to passing --max-width on the command line." } - }, - "additionalProperties": false + } }, "filter": { "type": "object", @@ -998,6 +1012,38 @@ ] } }, + "testPresetsV5": { + "type": "array", + "description": "An optional array of test preset objects. Used to specify arguments to ctest. Available in version 5 and higher.", + "allOf": [ + { "$ref": "#/definitions/testPresetsItemsV2" }, + { "$ref": "#/definitions/testPresetsItemsV3" } + ], + "items": { + "type": "object", + "properties": { + "name": {}, + "hidden": {}, + "inherits": {}, + "configurePreset": {}, + "vendor": {}, + "displayName": {}, + "description": {}, + "inheritConfigureEnvironment": {}, + "environment": {}, + "configuration": {}, + "overwriteConfigurationFile": {}, + "output": {}, + "filter": {}, + "execution": {}, + "condition": {} + }, + "required": [ + "name" + ], + "additionalProperties": false + } + }, "testPresetsV3": { "type": "array", "description": "An optional array of test preset objects. Used to specify arguments to ctest. Available in version 3 and higher.", |