This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d835b5cd6e41ebce97bd23196eb6ec999f822168 (commit)
via 4c8c442d7c2e61e87be9dd29ddfe2c4e4821df9f (commit)
from 019c552cfe459c734264a8b1ae16a759aafe329c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d835b5cd6e41ebce97bd23196eb6ec999f822168
commit d835b5cd6e41ebce97bd23196eb6ec999f822168
Merge: 019c552 4c8c442
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 7 11:45:03 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Nov 7 11:45:03 2014 -0500
Merge topic 'doc-cleanup-xrefs' into next
4c8c442d Help: Fix broken cross-references reported by 'nitpicky' option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c8c442d7c2e61e87be9dd29ddfe2c4e4821df9f
commit 4c8c442d7c2e61e87be9dd29ddfe2c4e4821df9f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 7 11:40:44 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Nov 7 11:41:21 2014 -0500
Help: Fix broken cross-references reported by 'nitpicky' option
Enable the Sphinx 'nitpicky' option and fix the resulting warnings about
dangling references.
diff --git a/Help/command/target_compile_options.rst
b/Help/command/target_compile_options.rst
index 0fdeba6..3362c5d 100644
--- a/Help/command/target_compile_options.rst
+++ b/Help/command/target_compile_options.rst
@@ -12,8 +12,8 @@ Add compile options to a target.
Specify compile options to use when compiling a given target. The
named ``<target>`` must have been created by a command such as
:command:`add_executable` or :command:`add_library` and must not be an
-:prop_tgt:`IMPORTED Target`. If ``BEFORE`` is specified, the content will
-be prepended to the property instead of being appended.
+:ref:`IMPORTED Target <Imported Targets>`. If ``BEFORE`` is specified,
+the content will be prepended to the property instead of being appended.
This command can be used to add any options, but
alternative commands exist to add preprocessor definitions
diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst
index ff756b4..d6f148d 100644
--- a/Help/command/target_sources.rst
+++ b/Help/command/target_sources.rst
@@ -12,7 +12,7 @@ Add sources to a target.
Specify sources to use when compiling a given target. The
named ``<target>`` must have been created by a command such as
:command:`add_executable` or :command:`add_library` and must not be an
-:prop_tgt:`IMPORTED Target`.
+:ref:`IMPORTED Target <Imported Targets>`.
The ``INTERFACE``, ``PUBLIC`` and ``PRIVATE`` keywords are required to
specify the scope of the following arguments. ``PRIVATE`` and ``PUBLIC``
diff --git a/Help/prop_sf/AUTOUIC_OPTIONS.rst b/Help/prop_sf/AUTOUIC_OPTIONS.rst
index 6dfabb0..bb48da9 100644
--- a/Help/prop_sf/AUTOUIC_OPTIONS.rst
+++ b/Help/prop_sf/AUTOUIC_OPTIONS.rst
@@ -6,7 +6,7 @@ Additional options for ``uic`` when using :prop_tgt:`AUTOUIC`
This property holds additional command line options
which will be used when ``uic`` is executed during the build via
:prop_tgt:`AUTOUIC`,
i.e. it is equivalent to the optional ``OPTIONS`` argument of the
-:module:`qt4_wrap_ui()<FindQt4>` macro.
+:module:`qt4_wrap_ui() <FindQt4>` macro.
By default it is empty.
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index 4b8dc1e..6f2eeb3 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -96,7 +96,7 @@
#
# If this is ``ON`` all components will be downloaded.
# By default is ``OFF`` or used value
-# from :variable:`CPACK_DOWNLOAD_ALL` if set
+# from ``CPACK_DOWNLOAD_ALL`` if set
#
# Components
# """"""""""
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index c715c81..a79246a 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -23,7 +23,7 @@
# .. note::
#
# When using :prop_tgt:`IMPORTED` targets, the qtmain.lib static library is
-# automatically linked on Windows for :variable:`WIN32 <WIN32_EXECUTABLE>`
+# automatically linked on Windows for :prop_tgt:`WIN32 <WIN32_EXECUTABLE>`
# executables. To disable that globally, set the
# ``QT4_NO_LINK_QTMAIN`` variable before finding Qt4. To disable that
# for a particular executable, set the ``QT4_NO_LINK_QTMAIN`` target
diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index fc26790..eb24a6e 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -31,6 +31,8 @@ exclude_patterns = []
extensions = ['cmake']
templates_path = ['@conf_path@/templates']
+nitpicky = True
+
cmake_manuals = sorted(glob.glob(r'@conf_docs@/manual/*.rst'))
cmake_manual_description = re.compile('^\.\. cmake-manual-description:(.*)$')
man_pages = []
-----------------------------------------------------------------------
Summary of changes:
Help/command/target_compile_options.rst | 4 ++--
Help/command/target_sources.rst | 2 +-
Help/prop_sf/AUTOUIC_OPTIONS.rst | 2 +-
Modules/CPackIFW.cmake | 2 +-
Modules/FindQt4.cmake | 2 +-
Utilities/Sphinx/conf.py.in | 2 ++
6 files changed, 8 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
