diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-24 14:46:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-24 14:46:52 (GMT) |
| commit | 414cfc6ecb92be706047c4e5309f65f3181bc3be (patch) | |
| tree | 93493d70ae1413065c2257e6db081b3843c9a4f8 /Help | |
| parent | 1c7b31e59e023b0f873b4f1830a219422493abbc (diff) | |
| parent | 6fa36470239a40ef81752ddea923d8618ad6eb7c (diff) | |
| download | CMake-414cfc6ecb92be706047c4e5309f65f3181bc3be.zip CMake-414cfc6ecb92be706047c4e5309f65f3181bc3be.tar.gz CMake-414cfc6ecb92be706047c4e5309f65f3181bc3be.tar.bz2 | |
Merge topic 'preset-flag-consistency'
6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument
3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument
2f13fdef0a cmake: Document '--preset <preset>' form of the argument
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5849
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake.1.rst | 4 | ||||
| -rw-r--r-- | Help/manual/ctest.1.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index b2bd1ed..157ea5f 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -377,7 +377,7 @@ Options about:tracing tab of Google Chrome or using a plugin for a tool like Trace Compass. -``--preset=<preset>`` +``--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 @@ -416,7 +416,7 @@ following options: Project binary directory to be built. This is required (unless a preset is specified) and must be first. -``--preset <preset>`` +``--preset <preset>``, ``--preset=<preset>`` Use a build preset to specify build options. The project binary directory is inferred from the ``configurePreset`` key. The current working directory must contain CMake preset files. diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 0a3614f..175359d 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -30,7 +30,7 @@ This program will run the tests and report results. Options ======= -``--preset <preset>`` +``--preset <preset>``, ``--preset=<preset>`` Use a test preset to specify test options. The project binary directory is inferred from the ``configurePreset`` key. The current working directory must contain CMake preset files. |