diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-22 14:26:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-22 14:27:06 (GMT) |
| commit | 3da68b95f0b6f2e7204644f7d4b6ea0e00c8744f (patch) | |
| tree | ed6eef64563b3775223fd4c896357320838020a5 | |
| parent | 37da981b7270a2e111afd69836712750fdc58228 (diff) | |
| parent | 71cbddf83ae552bab98620624573b820a7cb4161 (diff) | |
| download | CMake-3da68b95f0b6f2e7204644f7d4b6ea0e00c8744f.zip CMake-3da68b95f0b6f2e7204644f7d4b6ea0e00c8744f.tar.gz CMake-3da68b95f0b6f2e7204644f7d4b6ea0e00c8744f.tar.bz2 | |
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
| -rw-r--r-- | Help/manual/cmake.1.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 02828ac..f416f86 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -381,9 +381,9 @@ Options ``--preset <preset>``, ``--preset=<preset>`` Reads a :manual:`preset <cmake-presets(7)>` from ``<path-to-source>/CMakePresets.json`` and - ``<path-to-source>/CMakeUserPresets.json``. The preset specifies the - generator and the build directory, and optionally a list of variables and - other arguments to pass to CMake. The current working directory must contain + ``<path-to-source>/CMakeUserPresets.json``. The preset may specify the + generator and the build directory, and a list of variables and other + arguments to pass to CMake. The current working directory must contain CMake preset files. The :manual:`CMake GUI <cmake-gui(1)>` can also recognize ``CMakePresets.json`` and ``CMakeUserPresets.json`` files. For full details on these files, see :manual:`cmake-presets(7)`. |