Merge topic 'cmake-1-docs-for-presets'

71cbddf83a cmake(1): Change wording for fields in presets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !6026
This commit is contained in:
Brad King
2021-04-22 14:26:14 +00:00
committed by Kitware Robot
+3 -3
View File
@@ -381,9 +381,9 @@ Options
``--preset <preset>``, ``--preset=<preset>`` ``--preset <preset>``, ``--preset=<preset>``
Reads a :manual:`preset <cmake-presets(7)>` from Reads a :manual:`preset <cmake-presets(7)>` from
``<path-to-source>/CMakePresets.json`` and ``<path-to-source>/CMakePresets.json`` and
``<path-to-source>/CMakeUserPresets.json``. The preset specifies the ``<path-to-source>/CMakeUserPresets.json``. The preset may specify the
generator and the build directory, and optionally a list of variables and generator and the build directory, and a list of variables and other
other arguments to pass to CMake. The current working directory must contain arguments to pass to CMake. The current working directory must contain
CMake preset files. The :manual:`CMake GUI <cmake-gui(1)>` can CMake preset files. The :manual:`CMake GUI <cmake-gui(1)>` can
also recognize ``CMakePresets.json`` and ``CMakeUserPresets.json`` files. For also recognize ``CMakePresets.json`` and ``CMakeUserPresets.json`` files. For
full details on these files, see :manual:`cmake-presets(7)`. full details on these files, see :manual:`cmake-presets(7)`.