浏览代码

Merge topic 'doc-ctest'

36d76ed07c Help: cmake(1), ctest(1), versionadded for key flags

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7815
Brad King 3 年之前
父节点
当前提交
5bbca910e5
共有 2 个文件被更改,包括 13 次插入0 次删除
  1. 5 0
      Help/manual/cmake.1.rst
  2. 8 0
      Help/manual/ctest.1.rst

+ 5 - 0
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.
 

+ 8 - 0
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: