mirror of
https://github.com/Kitware/CMake.git
synced 2026-03-05 14:18:35 -06:00
Merge topic 'docpreset' into release-3.20
87b170d9f9Help: Add build and test preset to examples in cmake-presets(7)3f8cf006cbHelp: Clarify preset name conflict rules in cmake-presets(7) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5823
This commit is contained in:
@@ -95,8 +95,9 @@ that may contain the following fields:
|
||||
|
||||
A required string representing the machine-friendly name of the preset.
|
||||
This identifier is used in the :ref:`cmake --preset <CMake Options>` option.
|
||||
There must not be two presets in the union of ``CMakePresets.json`` and
|
||||
``CMakeUserPresets.json`` in the same directory with the same name.
|
||||
There must not be two configure presets in the union of ``CMakePresets.json``
|
||||
and ``CMakeUserPresets.json`` in the same directory with the same name.
|
||||
However, a configure preset may have the same name as a build or test preset.
|
||||
|
||||
``hidden``
|
||||
|
||||
@@ -314,9 +315,9 @@ that may contain the following fields:
|
||||
A required string representing the machine-friendly name of the preset.
|
||||
This identifier is used in the
|
||||
:ref:`cmake --build --preset <Build Tool Mode>` option.
|
||||
There must not be two presets (configure, build, or test) in the union of
|
||||
``CMakePresets.json`` and ``CMakeUserPresets.json`` in the same
|
||||
directory with the same name.
|
||||
There must not be two build presets in the union of ``CMakePresets.json``
|
||||
and ``CMakeUserPresets.json`` in the same directory with the same name.
|
||||
However, a build preset may have the same name as a configure or test preset.
|
||||
|
||||
``hidden``
|
||||
|
||||
@@ -433,9 +434,9 @@ that may contain the following fields:
|
||||
|
||||
A required string representing the machine-friendly name of the preset.
|
||||
This identifier is used in the :ref:`ctest --preset <CTest Options>` option.
|
||||
There must not be two presets (configure, build, or test) in the union of
|
||||
``CMakePresets.json`` and ``CMakeUserPresets.json`` in the same
|
||||
directory with the same name.
|
||||
There must not be two test presets in the union of ``CMakePresets.json``
|
||||
and ``CMakeUserPresets.json`` in the same directory with the same name.
|
||||
However, a test preset may have the same name as a configure or build preset.
|
||||
|
||||
``hidden``
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"version": 1,
|
||||
"version": 2,
|
||||
"cmakeMinimumRequired": {
|
||||
"major": 3,
|
||||
"minor": 19,
|
||||
"minor": 20,
|
||||
"patch": 0
|
||||
},
|
||||
"configurePresets": [
|
||||
@@ -37,6 +37,20 @@
|
||||
"generator": "Ninja Multi-Config"
|
||||
}
|
||||
],
|
||||
"buildPresets": [
|
||||
{
|
||||
"name": "default",
|
||||
"configurePreset": "default"
|
||||
}
|
||||
],
|
||||
"testPresets": [
|
||||
{
|
||||
"name": "default",
|
||||
"configurePreset": "default",
|
||||
"output": {"outputOnFailure": true},
|
||||
"execution": {"noTestsAction": "error", "stopOnFailure": true}
|
||||
}
|
||||
],
|
||||
"vendor": {
|
||||
"example.com/ExampleIDE/1.0": {
|
||||
"autoFormat": false
|
||||
|
||||
Reference in New Issue
Block a user