diff options
| author | Craig Scott <craig.scott@crascit.com> | 2020-11-29 21:01:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-29 21:02:00 (GMT) |
| commit | 5a868f148856b397a691057cbcf904c4a1b96729 (patch) | |
| tree | 5485f5b1b6f242cf12bff38f72591a1bfd016df1 /Help | |
| parent | f85f86415b1ef628ef5ffc851733927be4098378 (diff) | |
| parent | ca289abea53fb0bbeb3bf84a65a4685476ae9d15 (diff) | |
| download | CMake-5a868f148856b397a691057cbcf904c4a1b96729.zip CMake-5a868f148856b397a691057cbcf904c4a1b96729.tar.gz CMake-5a868f148856b397a691057cbcf904c4a1b96729.tar.bz2 | |
Merge topic 'presets-docs-bug'
ca289abea5 Help: Fix presets typo (longDescription to displayName)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5541
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-presets.7.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Help/manual/cmake-presets.7.rst b/Help/manual/cmake-presets.7.rst index 62c4b7c..6f137c4 100644 --- a/Help/manual/cmake-presets.7.rst +++ b/Help/manual/cmake-presets.7.rst @@ -93,7 +93,7 @@ Format 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 ``longDescription``), but can override them as + ``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 |