diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-24 16:31:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-24 16:31:15 (GMT) |
| commit | 29f66bd1cf834b5ea1d62936169260dc75f4d2e9 (patch) | |
| tree | 11df56e913f9a9145fecbf253cf11a19f99b4764 | |
| parent | 30fcc4460f10f79736014835fe890cd1c966845a (diff) | |
| parent | 36d76ed07cb5de9d6687b048807786de7b8c46d7 (diff) | |
| download | CMake-29f66bd1cf834b5ea1d62936169260dc75f4d2e9.zip CMake-29f66bd1cf834b5ea1d62936169260dc75f4d2e9.tar.gz CMake-29f66bd1cf834b5ea1d62936169260dc75f4d2e9.tar.bz2 | |
Merge topic 'doc-ctest' into release-3.25
36d76ed07c Help: cmake(1), ctest(1), versionadded for key flags
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7815
| -rw-r--r-- | Help/manual/cmake.1.rst | 5 | ||||
| -rw-r--r-- | Help/manual/ctest.1.rst | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 3dc6d69..35bd05f 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -142,6 +142,9 @@ source and build trees and generate a buildsystem: $ cmake . ``cmake [<options>] -S <path-to-source> -B <path-to-build>`` + + .. versionadded:: 3.13 + Uses ``<path-to-build>`` as the build tree and ``<path-to-source>`` as the source tree. The specified paths may be absolute or relative to the current working directory. The source tree must contain a @@ -555,6 +558,8 @@ following options: .. option:: -j [<jobs>], --parallel [<jobs>] + .. versionadded:: 3.12 + The maximum number of concurrent processes to use when building. If ``<jobs>`` is omitted the native build tool's default number is used. diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 1e691be..3497a9f 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -168,6 +168,8 @@ Run Tests .. option:: --output-junit <file> + .. versionadded:: 3.21 + Write test results in JUnit format. This option tells CTest to write test results to ``<file>`` in JUnit XML @@ -183,6 +185,10 @@ Run Tests actually run them. Useful in conjunction with the :option:`-R <ctest -R>` and :option:`-E <ctest -E>` options. + .. versionadded:: 3.14 + + The ``--show-only`` option accepts a ``<format>`` value. + ``<format>`` can be one of the following values. ``human`` @@ -1491,6 +1497,8 @@ Configuration settings include: Show as JSON Object Model ========================= +.. versionadded:: 3.14 + When the ``--show-only=json-v1`` command line option is given, the test information is output in JSON format. Version 1.0 of the JSON object model is defined as follows: |