summaryrefslogtreecommitdiffstats
path: root/Tests/CMakeLib
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-10-28 13:09:08 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-10-28 13:09:24 (GMT)
commit3055b202ecc1a1fd3d7cb25aefc4d511a0cac585 (patch)
tree4544f9c8856e1f8eeee1b80f91acd5e9edacb768 /Tests/CMakeLib
parentf186934161c4cc6ac14257a0b045c53b3ba6ca7c (diff)
parent054754359a0b6b5721dea722b7920c954a573451 (diff)
downloadCMake-3055b202ecc1a1fd3d7cb25aefc4d511a0cac585.zip
CMake-3055b202ecc1a1fd3d7cb25aefc4d511a0cac585.tar.gz
CMake-3055b202ecc1a1fd3d7cb25aefc4d511a0cac585.tar.bz2
Merge topic 'builtin-help-versionadded'
054754359a cmRST: support `versionadded` and `versionchanged` directives Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6667
Diffstat (limited to 'Tests/CMakeLib')
-rw-r--r--Tests/CMakeLib/testRST.expect6
-rw-r--r--Tests/CMakeLib/testRST.rst6
2 files changed, 12 insertions, 0 deletions
diff --git a/Tests/CMakeLib/testRST.expect b/Tests/CMakeLib/testRST.expect
index 4870f65..5e3cdb1 100644
--- a/Tests/CMakeLib/testRST.expect
+++ b/Tests/CMakeLib/testRST.expect
@@ -116,6 +116,12 @@ A literal block can be empty::
.. note::
Notes are called out.
+.. versionadded:: 1.2
+ Version blocks are preserved.
+
+.. versionchanged:: 2.3
+ Version blocks are preserved.
+
substituted text with multiple lines becomes one line
End of first include.
diff --git a/Tests/CMakeLib/testRST.rst b/Tests/CMakeLib/testRST.rst
index 44931a7..4139801 100644
--- a/Tests/CMakeLib/testRST.rst
+++ b/Tests/CMakeLib/testRST.rst
@@ -123,6 +123,12 @@ A literal block can be empty::
.. note::
Notes are called out.
+.. versionadded:: 1.2
+ Version blocks are preserved.
+
+.. versionchanged:: 2.3
+ Version blocks are preserved.
+
.. |substitution| replace::
|nested substitution|
with multiple lines becomes one line