Commit 6cbad490 authored by Brad King's avatar Brad King
Browse files

Merge branch 'sphinx-1.4' into release

parents 84df4a49 30abf145
......@@ -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
......
......@@ -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.
......
......@@ -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.]]
......
......@@ -40,7 +40,7 @@
# set(FOO_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@" )
# set(FOO_DATA_DIR "@CMAKE_INSTALL_PREFIX@/@RELATIVE_DATA_INSTALL_DIR@" )
# set(FOO_ICONS_DIR "@CMAKE_INSTALL_PREFIX@/share/icons" )
# ...logic to determine installedPrefix from the own location...
# #...logic to determine installedPrefix from the own location...
# set(FOO_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@" )
#
# All 4 options shown above are not sufficient, since the first 3 hardcode the
......@@ -174,7 +174,7 @@
# set(INCLUDE_INSTALL_DIR include/ ... CACHE )
# set(LIB_INSTALL_DIR lib/ ... CACHE )
# set(SYSCONFIG_INSTALL_DIR etc/foo/ ... CACHE )
# ...
# #...
# include(CMakePackageConfigHelpers)
# configure_package_config_file(FooConfig.cmake.in
# ${CMAKE_CURRENT_BINARY_DIR}/FooConfig.cmake
......@@ -190,7 +190,7 @@
#
# ``FooConfig.cmake.in``:
#
# .. code-block:: cmake
# ::
#
# set(FOO_VERSION x.y.z)
# ...
......
file(READ "${CSS_DIR}/basic.css" BasicCssContent)
file(READ "${CSS_DIR}/default.css" DefaultCssContent)
string(REPLACE
"@import url(\"basic.css\")" "${BasicCssContent}"
DefaultCssContent "${DefaultCssContent}"
)
if(EXISTS "${CSS_DIR}/default.css")
file(READ "${CSS_DIR}/default.css" DefaultCssContent)
string(REPLACE
"@import url(\"basic.css\")" "${BasicCssContent}"
DefaultCssContent "${DefaultCssContent}"
)
else()
set(DefaultCssContent "${BasicCssContent}")
endif()
file(READ "${CSS_DIR}/cmake.css" CMakeCssContent)
string(REPLACE
......
......@@ -46,7 +46,7 @@ from sphinx.directives import ObjectDescription
from sphinx.domains import Domain, ObjType
from sphinx.roles import XRefRole
from sphinx.util.nodes import make_refnode
from sphinx import addnodes
from sphinx import addnodes, version_info
class CMakeModule(Directive):
required_arguments = 1
......@@ -123,7 +123,11 @@ class _cmake_index_entry:
self.desc = desc
def __call__(self, title, targetid, main = 'main'):
return ('pair', u'%s ; %s' % (self.desc, title), targetid, main)
# See https://github.com/sphinx-doc/sphinx/issues/2673
if version_info < (1, 4):
return ('pair', u'%s ; %s' % (self.desc, title), targetid, main)
else:
return ('pair', u'%s ; %s' % (self.desc, title), targetid, main, None)
_cmake_index_objs = {
'command': _cmake_index_entry('command'),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment