diff options
| author | Brad King <brad.king@kitware.com> | 2024-10-07 13:11:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-10-07 13:11:48 (GMT) |
| commit | 5b7ab1818bc5f5cb26e46f611fb2607bf42e8aca (patch) | |
| tree | 4adb579d41994d596bc85592b0b720f836161d00 /Help | |
| parent | 9a14348a2c2816569a1d8f873f2b9e6da37aacc6 (diff) | |
| parent | b80aa1d3a3ba1ad351ad57c42361408a72f7254d (diff) | |
| download | CMake-5b7ab1818bc5f5cb26e46f611fb2607bf42e8aca.zip CMake-5b7ab1818bc5f5cb26e46f611fb2607bf42e8aca.tar.gz CMake-5b7ab1818bc5f5cb26e46f611fb2607bf42e8aca.tar.bz2 | |
Merge topic 'cmake--workflow-preset'
b80aa1d3a3 preset: Easier command line interface for Workflow Presets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9866
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake.1.rst | 13 | ||||
| -rw-r--r-- | Help/release/dev/cmake--workflow-preset.rst | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 586a72e..4610e11 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -31,7 +31,7 @@ Synopsis cmake --find-package [<options>] `Run a Workflow Preset`_ - cmake --workflow [<options>] + cmake --workflow <options> `View Help`_ cmake --help[-<topic>] @@ -1394,7 +1394,7 @@ build steps in order: .. code-block:: shell - cmake --workflow [<options>] + cmake --workflow <options> The options are: @@ -1411,6 +1411,15 @@ The options are: must contain CMake preset files. See :manual:`preset <cmake-presets(7)>` for more details. + .. versionchanged:: 3.31 + When following immediately after the ``--workflow`` option, + the ``--preset`` argument can be omitted and just the ``<preset>`` + name can be given. This means the following syntax is valid: + + .. code-block:: console + + $ cmake --workflow my-preset + .. option:: --list-presets Lists the available workflow presets. The current working directory must diff --git a/Help/release/dev/cmake--workflow-preset.rst b/Help/release/dev/cmake--workflow-preset.rst new file mode 100644 index 0000000..2e07eb9 --- /dev/null +++ b/Help/release/dev/cmake--workflow-preset.rst @@ -0,0 +1,6 @@ +cmake--workflow-preset +---------------------- + +* When executing a CMake workflow preset, the ``--preset`` option can now be + omitted, allowing the simpler command line + :option:`cmake --workflow \<preset\> <cmake--workflow --preset>`. |