diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-10 16:32:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-10 16:32:21 (GMT) |
| commit | 46c6489850ca9029bb75d17ed652563fc58a0082 (patch) | |
| tree | 9da1be068dbcc52038b7c5356be86fbdfa9e91b8 /Help | |
| parent | ada0bc21f42e25882ddf5a8aab10eaf3ea7e0b89 (diff) | |
| parent | 30abf145fd48f50c26ee7553fd2512e59be97f25 (diff) | |
| download | CMake-46c6489850ca9029bb75d17ed652563fc58a0082.zip CMake-46c6489850ca9029bb75d17ed652563fc58a0082.tar.gz CMake-46c6489850ca9029bb75d17ed652563fc58a0082.tar.bz2 | |
Merge topic 'sphinx-1.4'
30abf145 Help: Fix cmake code block warnings produced by Sphinx 1.4
97917900 Utilities/Sphinx: Port qthelp css workaround to Sphinx 1.4
971384c2 Utilities/Sphinx: Port cmake extension to Sphinx 1.4
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/if.rst | 6 | ||||
| -rw-r--r-- | Help/manual/cmake-developer.7.rst | 4 | ||||
| -rw-r--r-- | Help/manual/cmake-language.7.rst | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Help/command/if.rst b/Help/command/if.rst index 0941029..2a087d0 100644 --- a/Help/command/if.rst +++ b/Help/command/if.rst @@ -9,17 +9,17 @@ Conditionally execute a group of commands. # then section. COMMAND1(ARGS ...) COMMAND2(ARGS ...) - ... + #... elseif(expression2) # elseif section. COMMAND1(ARGS ...) COMMAND2(ARGS ...) - ... + #... else(expression) # else section. COMMAND1(ARGS ...) COMMAND2(ARGS ...) - ... + #... endif(expression) Evaluates the given expression. If the result is true, the commands diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst index 46b922b..f77d8c0 100644 --- a/Help/manual/cmake-developer.7.rst +++ b/Help/manual/cmake-developer.7.rst @@ -540,7 +540,7 @@ a :ref:`Line Comment` block of the form: or a :ref:`Bracket Comment` of the form: -.. code-block:: cmake +:: #[[.rst: <module-name> @@ -558,7 +558,7 @@ All such comments must start with ``#`` in the first column. For example, a ``Modules/Findxxx.cmake`` module may contain: -.. code-block:: cmake +:: # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst index 41542c9..ba0b30f 100644 --- a/Help/manual/cmake-language.7.rst +++ b/Help/manual/cmake-language.7.rst @@ -255,7 +255,7 @@ invocation as exactly one argument. For example: -.. code-block:: cmake +:: message("This is a quoted argument containing multiple lines. This is always one argument even though it contains a ; character. @@ -421,7 +421,7 @@ A ``#`` immediately followed by a `Bracket Argument`_ forms a For example: -.. code-block:: cmake +:: #[[This is a bracket comment. It runs until the close bracket.]] |