diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-09 12:51:17 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-11-09 07:51:35 -0500 |
| commit | 44849f14b0f5a8c3ff9ac47c9e8b9b0b56ac626f (patch) | |
| tree | 4e250f02f7c4077d7478a59f5b8843c95e72a5d3 | |
| parent | 2b9b64269f8b9d16a04a098144a3557ce9ee8aae (diff) | |
| parent | 6dc64124770a211b46184ee9834dceaceda19d6c (diff) | |
| download | cmake-44849f14b0f5a8c3ff9ac47c9e8b9b0b56ac626f.tar.gz | |
Merge topic 'doc-preset-inheritance' into release-3.22
6dc6412477 Help: Use stronger wording in rule about preset inheritance
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6710
| -rw-r--r-- | Help/manual/presets/schema.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Help/manual/presets/schema.json b/Help/manual/presets/schema.json index 767e80b6b1..7852550dcf 100644 --- a/Help/manual/presets/schema.json +++ b/Help/manual/presets/schema.json @@ -124,7 +124,7 @@ }, { "type": "array", - "description": "An optional array of strings representing the names of presets to inherit from. The preset will inherit all of the fields from the inherits presets by default (except name, hidden, inherits, description, and displayName), but can override them as desired. If multiple inherits presets provide conflicting values for the same field, the earlier preset in the inherits list will be preferred. Presets in CMakePresets.json may not inherit from presets in CMakeUserPresets.json.", + "description": "An optional array of strings representing the names of presets to inherit from. The preset will inherit all of the fields from the inherits presets by default (except name, hidden, inherits, description, and displayName), but can override them as desired. If multiple inherits presets provide conflicting values for the same field, the earlier preset in the inherits list will be preferred. Presets in CMakePresets.json must not inherit from presets in CMakeUserPresets.json.", "items": { "type": "string", "description": "An optional string representing the name of the preset to inherit from.", @@ -446,7 +446,7 @@ }, { "type": "array", - "description": "An optional array of strings representing the names of build presets to inherit from. The preset will inherit all of the fields from the inherits presets by default (except name, hidden, inherits, description, and displayName), but can override them as desired. If multiple inherits presets provide conflicting values for the same field, the earlier preset in the inherits list will be preferred. Presets in CMakePresets.json may not inherit from presets in CMakeUserPresets.json.", + "description": "An optional array of strings representing the names of build presets to inherit from. The preset will inherit all of the fields from the inherits presets by default (except name, hidden, inherits, description, and displayName), but can override them as desired. If multiple inherits presets provide conflicting values for the same field, the earlier preset in the inherits list will be preferred. Presets in CMakePresets.json must not inherit from presets in CMakeUserPresets.json.", "items": { "type": "string", "description": "An optional string representing the name of the preset to inherit from.", @@ -641,7 +641,7 @@ }, { "type": "array", - "description": "An optional array of strings representing the names of test presets to inherit from. The preset will inherit all of the fields from the inherits presets by default (except name, hidden, inherits, description, and displayName), but can override them as desired. If multiple inherits presets provide conflicting values for the same field, the earlier preset in the inherits list will be preferred. Presets in CMakePresets.json may not inherit from presets in CMakeUserPresets.json.", + "description": "An optional array of strings representing the names of test presets to inherit from. The preset will inherit all of the fields from the inherits presets by default (except name, hidden, inherits, description, and displayName), but can override them as desired. If multiple inherits presets provide conflicting values for the same field, the earlier preset in the inherits list will be preferred. Presets in CMakePresets.json must not inherit from presets in CMakeUserPresets.json.", "items": { "type": "string", "description": "An optional string representing the name of the preset to inherit from.", |