浏览代码

Merge branch 'release-doc-formatting' into doc-formatting

Resolve conflict in Modules/ExternalProject.cmake by keeping our side,
which is more completely revised.
Brad King 11 年之前
父节点
当前提交
67c4be51a3

+ 11 - 8
Help/command/add_library.rst

@@ -133,14 +133,17 @@ Creates an :ref:`Interface Library <Interface Libraries>`.  An ``INTERFACE``
 library target does not directly create build output, though it may
 have properties set on it and it may be installed, exported and
 imported. Typically the ``INTERFACE_*`` properties are populated on
-the interface target using the :command:`set_property`,
-:command:`target_link_libraries(INTERFACE)`,
-:command:`target_include_directories(INTERFACE)`,
-:command:`target_compile_options(INTERFACE)`,
-:command:`target_compile_definitions(INTERFACE)`,
-and :command:`target_sources(INTERFACE)` commands, and then it
-is used as an argument to :command:`target_link_libraries` like any other
-target.
+the interface target using the commands:
+
+* :command:`set_property`,
+* :command:`target_link_libraries(INTERFACE)`,
+* :command:`target_include_directories(INTERFACE)`,
+* :command:`target_compile_options(INTERFACE)`,
+* :command:`target_compile_definitions(INTERFACE)`, and
+* :command:`target_sources(INTERFACE)`,
+
+and then it is used as an argument to :command:`target_link_libraries`
+like any other target.
 
 An ``INTERFACE`` :ref:`Imported Target <Imported Targets>` may also be
 created with this signature.  An ``IMPORTED`` library target references a

+ 1 - 1
Help/manual/cmake-buildsystem.7.rst

@@ -3,7 +3,7 @@
 cmake-buildsystem(7)
 ********************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 1 - 1
Help/manual/cmake-commands.7.rst

@@ -3,7 +3,7 @@
 cmake-commands(7)
 *****************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 1 - 1
Help/manual/cmake-compile-features.7.rst

@@ -3,7 +3,7 @@
 cmake-compile-features(7)
 *************************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 1 - 1
Help/manual/cmake-developer.7.rst

@@ -3,7 +3,7 @@
 cmake-developer(7)
 ******************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 1 - 1
Help/manual/cmake-generator-expressions.7.rst

@@ -3,7 +3,7 @@
 cmake-generator-expressions(7)
 ******************************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 1 - 1
Help/manual/cmake-generators.7.rst

@@ -3,7 +3,7 @@
 cmake-generators(7)
 *******************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 73 - 1
Help/manual/cmake-language.7.rst

@@ -3,7 +3,7 @@
 cmake-language(7)
 *****************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 
@@ -79,6 +79,10 @@ A CMake Language source file consists of zero or more
 `Command Invocations`_ separated by newlines and optionally
 spaces and `Comments`_:
 
+.. raw:: latex
+
+   \begin{small}
+
 .. productionlist::
  file: `file_element`*
  file_element: `command_invocation` `line_ending` |
@@ -87,6 +91,10 @@ spaces and `Comments`_:
  space: <match '[ \t]+'>
  newline: <match '\n'>
 
+.. raw:: latex
+
+   \end{small}
+
 Note that any source file line not inside `Command Arguments`_ or
 a `Bracket Comment`_ can end in a `Line Comment`_.
 
@@ -98,6 +106,10 @@ Command Invocations
 A *command invocation* is a name followed by paren-enclosed arguments
 separated by whitespace:
 
+.. raw:: latex
+
+   \begin{small}
+
 .. productionlist::
  command_invocation: `space`* `identifier` `space`* '(' `arguments` ')'
  identifier: <match '[A-Za-z_][A-Za-z0-9_]*'>
@@ -106,6 +118,10 @@ separated by whitespace:
                     : `separation`* '(' `arguments` ')'
  separation: `space` | `line_ending`
 
+.. raw:: latex
+
+   \end{small}
+
 For example:
 
 .. code-block:: cmake
@@ -137,9 +153,17 @@ Command Arguments
 
 There are three types of arguments within `Command Invocations`_:
 
+.. raw:: latex
+
+   \begin{small}
+
 .. productionlist::
  argument: `bracket_argument` | `quoted_argument` | `unquoted_argument`
 
+.. raw:: latex
+
+   \end{small}
+
 .. _`Bracket Argument`:
 
 Bracket Argument
@@ -149,6 +173,10 @@ A *bracket argument*, inspired by `Lua`_ long bracket syntax,
 encloses content between opening and closing "brackets" of the
 same length:
 
+.. raw:: latex
+
+   \begin{small}
+
 .. productionlist::
  bracket_argument: `bracket_open` `bracket_content` `bracket_close`
  bracket_open: '[' '='{len} '['
@@ -156,6 +184,10 @@ same length:
                 :  of the same {len} as the `bracket_open`>
  bracket_close: ']' '='{len} ']'
 
+.. raw:: latex
+
+   \end{small}
+
 An opening bracket of length *len >= 0* is written ``[`` followed
 by *len* ``=`` followed by ``[`` and the corresponding closing
 bracket is written ``]`` followed by *len* ``=`` followed by ``]``.
@@ -197,6 +229,10 @@ Quoted Argument
 A *quoted argument* encloses content between opening and closing
 double-quote characters:
 
+.. raw:: latex
+
+   \begin{small}
+
 .. productionlist::
  quoted_argument: '"' `quoted_element`* '"'
  quoted_element: <any character except '\' or '"'> |
@@ -204,6 +240,10 @@ double-quote characters:
                  : `quoted_continuation`
  quoted_continuation: '\' `newline`
 
+.. raw:: latex
+
+   \end{small}
+
 Quoted argument content consists of all text between opening and
 closing quotes.  Both `Escape Sequences`_ and `Variable References`_
 are evaluated.  A quoted argument is always given to the command
@@ -246,12 +286,20 @@ An *unquoted argument* is not enclosed by any quoting syntax.
 It may not contain any whitespace, ``(``, ``)``, ``#``, ``"``, or ``\``
 except when escaped by a backslash:
 
+.. raw:: latex
+
+   \begin{small}
+
 .. productionlist::
  unquoted_argument: `unquoted_element`+ | `unquoted_legacy`
  unquoted_element: <any character except whitespace or one of '()#"\'> |
                  : `escape_sequence`
  unquoted_legacy: <see note in text>
 
+.. raw:: latex
+
+   \end{small}
+
 Unquoted argument content consists of all text in a contiguous block
 of allowed or escaped characters.  Both `Escape Sequences`_ and
 `Variable References`_ are evaluated.  The resulting value is divided
@@ -294,12 +342,20 @@ Escape Sequences
 
 An *escape sequence* is a ``\`` followed by one character:
 
+.. raw:: latex
+
+   \begin{small}
+
 .. productionlist::
  escape_sequence: `escape_identity` | `escape_encoded` | `escape_semicolon`
  escape_identity: '\' <match '[^A-Za-z0-9;]'>
  escape_encoded: '\t' | '\r' | '\n'
  escape_semicolon: '\;'
 
+.. raw:: latex
+
+   \end{small}
+
 A ``\`` followed by a non-alphanumeric character simply encodes the literal
 character without interpreting it as syntax.  A ``\t``, ``\r``, or ``\n``
 encodes a tab, carriage return, or newline character, respectively. A ``\;``
@@ -348,9 +404,17 @@ Bracket Comment
 A ``#`` immediately followed by a `Bracket Argument`_ forms a
 *bracket comment* consisting of the entire bracket enclosure:
 
+.. raw:: latex
+
+   \begin{small}
+
 .. productionlist::
  bracket_comment: '#' `bracket_argument`
 
+.. raw:: latex
+
+   \end{small}
+
 For example:
 
 .. code-block:: cmake
@@ -371,10 +435,18 @@ Line Comment
 A ``#`` not immediately followed by a `Bracket Argument`_ forms a
 *line comment* that runs until the end of the line:
 
+.. raw:: latex
+
+   \begin{small}
+
 .. productionlist::
  line_comment: '#' <any text not starting in a `bracket_argument`
              :      and not containing a `newline`>
 
+.. raw:: latex
+
+   \end{small}
+
 For example:
 
 .. code-block:: cmake

+ 1 - 1
Help/manual/cmake-modules.7.rst

@@ -3,7 +3,7 @@
 cmake-modules(7)
 ****************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 2 - 2
Help/manual/cmake-packages.7.rst

@@ -3,7 +3,7 @@
 cmake-packages(7)
 *****************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 
@@ -479,7 +479,7 @@ be true. This can be tested with logic in the package configuration file:
   foreach(_comp ${ClimbingStats_FIND_COMPONENTS})
     if (NOT ";${_supported_components};" MATCHES _comp)
       set(ClimbingStats_FOUND False)
-      set(ClimbingStats_NOTFOUND_MESSAGE "Specified unsupported component: ${_comp}")
+      set(ClimbingStats_NOTFOUND_MESSAGE "Unsupported component: ${_comp}")
     endif()
     include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStats${_comp}Targets.cmake")
   endforeach()

+ 1 - 1
Help/manual/cmake-policies.7.rst

@@ -3,7 +3,7 @@
 cmake-policies(7)
 *****************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 1 - 1
Help/manual/cmake-properties.7.rst

@@ -3,7 +3,7 @@
 cmake-properties(7)
 *******************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 1 - 1
Help/manual/cmake-qt.7.rst

@@ -3,7 +3,7 @@
 cmake-qt(7)
 ***********
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 1 - 1
Help/manual/cmake-toolchains.7.rst

@@ -3,7 +3,7 @@
 cmake-toolchains(7)
 *******************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 1 - 1
Help/manual/cmake-variables.7.rst

@@ -3,7 +3,7 @@
 cmake-variables(7)
 ******************
 
-.. only:: html or latex
+.. only:: html
 
    .. contents::
 

+ 2 - 2
Modules/CPackNSIS.cmake

@@ -114,8 +114,8 @@
 #  installation prefix.  Like::
 #
 #   set(CPACK_NSIS_MENU_LINKS
-#       "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html" "CMake Help"
-#       "http://www.cmake.org" "CMake Web Site")
+#       "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html"
+#       "CMake Help" "http://www.cmake.org" "CMake Web Site")
 #
 
 #=============================================================================

+ 1 - 1
Modules/FeatureSummary.cmake

@@ -17,7 +17,7 @@
 # ::
 #
 #     -- The following OPTIONAL packages have been found:
-#     LibXml2 (required version >= 2.4) , XML processing library. , <http://xmlsoft.org>
+#     LibXml2 (required version >= 2.4), XML processing lib, <http://xmlsoft.org>
 #        * Enables HTML-import in MyWordProcessor
 #        * Enables odt-export in MyWordProcessor
 #     PNG , A PNG image library. , <http://www.libpng.org/pub/png/>

+ 4 - 4
Modules/FindCUDA.cmake

@@ -278,13 +278,13 @@
 #                            Only available for CUDA version 3.2+.
 #   CUDA_cusparse_LIBRARY -- CUDA Sparse Matrix library.
 #                            Only available for CUDA version 3.2+.
-#   CUDA_npp_LIBRARY      -- NVIDIA Performance Primitives library.
+#   CUDA_npp_LIBRARY      -- NVIDIA Performance Primitives lib.
 #                            Only available for CUDA version 4.0+.
-#   CUDA_nppc_LIBRARY      -- NVIDIA Performance Primitives library (core).
+#   CUDA_nppc_LIBRARY     -- NVIDIA Performance Primitives lib (core).
 #                            Only available for CUDA version 5.5+.
-#   CUDA_nppi_LIBRARY      -- NVIDIA Performance Primitives library (image processing).
+#   CUDA_nppi_LIBRARY     -- NVIDIA Performance Primitives lib (image processing).
 #                            Only available for CUDA version 5.5+.
-#   CUDA_npps_LIBRARY      -- NVIDIA Performance Primitives library (signal processing).
+#   CUDA_npps_LIBRARY     -- NVIDIA Performance Primitives lib (signal processing).
 #                            Only available for CUDA version 5.5+.
 #   CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library.
 #                            Only available for CUDA version 3.2+.

+ 7 - 4
Modules/FindGettext.cmake

@@ -17,6 +17,7 @@
 #
 #
 # Additionally it provides the following macros:
+#
 # GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ...  fileN )
 #
 # ::
@@ -32,8 +33,9 @@
 # ::
 #
 #      Process the given pot file to mo files.
-#      If INSTALL_DESTINATION is given then automatically install rules will be created,
-#      the language subdirectory will be taken into account (by default use share/locale/).
+#      If INSTALL_DESTINATION is given then automatically install rules will
+#      be created, the language subdirectory will be taken into account
+#      (by default use share/locale/).
 #      If ALL is specified, the pot file is processed when building the all traget.
 #      It creates a custom target "potfile".
 #
@@ -43,8 +45,9 @@
 # ::
 #
 #      Process the given po files to mo files for the given language.
-#      If INSTALL_DESTINATION is given then automatically install rules will be created,
-#      the language subdirectory will be taken into account (by default use share/locale/).
+#      If INSTALL_DESTINATION is given then automatically install rules will
+#      be created, the language subdirectory will be taken into account
+#      (by default use share/locale/).
 #      If ALL is specified, the po files are processed when building the all traget.
 #      It creates a custom target "pofiles".
 

+ 1 - 1
Modules/FindJava.cmake

@@ -17,7 +17,7 @@
 #   Java_JAVAH_EXECUTABLE   = the full path to the Java header generator
 #   Java_JAVADOC_EXECUTABLE = the full path to the Java documention generator
 #   Java_JAR_EXECUTABLE     = the full path to the Java archiver
-#   Java_VERSION_STRING     = Version of the package found (java version), eg. 1.6.0_12
+#   Java_VERSION_STRING     = Version of java found, eg. 1.6.0_12
 #   Java_VERSION_MAJOR      = The major version of the package found.
 #   Java_VERSION_MINOR      = The minor version of the package found.
 #   Java_VERSION_PATCH      = The patch version of the package found.

+ 4 - 4
Modules/FindLibXslt.cmake

@@ -17,10 +17,10 @@
 # Additionally, the following two variables are set (but not required
 # for using xslt):
 #
-# ::
-#
-#   LIBXSLT_EXSLT_LIBRARIES - Link to these if you need to link against the exslt library
-#   LIBXSLT_XSLTPROC_EXECUTABLE - Contains the full path to the xsltproc executable if found
+# ``LIBXSLT_EXSLT_LIBRARIES``
+#   Link to these if you need to link against the exslt library.
+# ``LIBXSLT_XSLTPROC_EXECUTABLE``
+#   Contains the full path to the xsltproc executable if found.
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.

+ 4 - 3
Modules/FindPkgConfig.cmake

@@ -490,9 +490,10 @@ endmacro()
 
     pkg_check_modules (XRENDER REQUIRED xrender)
 
- Defines e.g.:
- ``XRENDER_LIBRARIES=Xrender;X11`` and
- ``XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp``
+ Defines for example::
+
+   XRENDER_LIBRARIES=Xrender;X11``
+   XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
 #]========================================]
 macro(pkg_check_modules _prefix _module0)
   # check cached value

+ 64 - 111
Modules/FindProtobuf.cmake

@@ -2,127 +2,80 @@
 # FindProtobuf
 # ------------
 #
-#
-#
 # Locate and configure the Google Protocol Buffers library.
 #
 # The following variables can be set and are optional:
 #
-# ::
-#
-#    PROTOBUF_SRC_ROOT_FOLDER - When compiling with MSVC, if this cache variable is set
-#                               the protobuf-default VS project build locations
-#                               (vsprojects/Debug & vsprojects/Release) will be searched
-#                               for libraries and binaries.
-#
-#
-#
-# ::
-#
-#    PROTOBUF_IMPORT_DIRS     - List of additional directories to be searched for
-#                               imported .proto files. (New in CMake 2.8.8)
-#
-#
+# ``PROTOBUF_SRC_ROOT_FOLDER``
+#   When compiling with MSVC, if this cache variable is set
+#   the protobuf-default VS project build locations
+#   (vsprojects/Debug & vsprojects/Release) will be searched
+#   for libraries and binaries.
+# ``PROTOBUF_IMPORT_DIRS``
+#   List of additional directories to be searched for
+#   imported .proto files.
 #
 # Defines the following variables:
 #
-# ::
-#
-#    PROTOBUF_FOUND - Found the Google Protocol Buffers library (libprotobuf & header files)
-#    PROTOBUF_INCLUDE_DIRS - Include directories for Google Protocol Buffers
-#    PROTOBUF_LIBRARIES - The protobuf libraries
-#
-# [New in CMake 2.8.5]
-#
-# ::
-#
-#    PROTOBUF_PROTOC_LIBRARIES - The protoc libraries
-#    PROTOBUF_LITE_LIBRARIES - The protobuf-lite libraries
-#
-#
+# ``PROTOBUF_FOUND``
+#   Found the Google Protocol Buffers library
+#   (libprotobuf & header files)
+# ``PROTOBUF_INCLUDE_DIRS``
+#   Include directories for Google Protocol Buffers
+# ``PROTOBUF_LIBRARIES``
+#   The protobuf libraries
+# ``PROTOBUF_PROTOC_LIBRARIES``
+#   The protoc libraries
+# ``PROTOBUF_LITE_LIBRARIES``
+#   The protobuf-lite libraries
 #
 # The following cache variables are also available to set or use:
 #
-# ::
-#
-#    PROTOBUF_LIBRARY - The protobuf library
-#    PROTOBUF_PROTOC_LIBRARY   - The protoc library
-#    PROTOBUF_INCLUDE_DIR - The include directory for protocol buffers
-#    PROTOBUF_PROTOC_EXECUTABLE - The protoc compiler
-#
-# [New in CMake 2.8.5]
-#
-# ::
-#
-#    PROTOBUF_LIBRARY_DEBUG - The protobuf library (debug)
-#    PROTOBUF_PROTOC_LIBRARY_DEBUG   - The protoc library (debug)
-#    PROTOBUF_LITE_LIBRARY - The protobuf lite library
-#    PROTOBUF_LITE_LIBRARY_DEBUG - The protobuf lite library (debug)
-#
-#
-#
-# ::
-#
-#   ====================================================================
-#   Example:
-#
-#
-#
-# ::
-#
-#    find_package(Protobuf REQUIRED)
-#    include_directories(${PROTOBUF_INCLUDE_DIRS})
-#
-#
-#
-# ::
-#
-#    include_directories(${CMAKE_CURRENT_BINARY_DIR})
-#    PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS foo.proto)
-#    add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS})
-#    target_link_libraries(bar ${PROTOBUF_LIBRARIES})
-#
-#
-#
-# NOTE: You may need to link against pthreads, depending
-#
-# ::
-#
-#        on the platform.
-#
-#
-#
-# NOTE: The PROTOBUF_GENERATE_CPP macro & add_executable() or
-# add_library()
-#
-# ::
-#
-#        calls only work properly within the same directory.
-#
-#
-#
-# ::
-#
-#   ====================================================================
-#
-#
-#
-# PROTOBUF_GENERATE_CPP (public function)
-#
-# ::
-#
-#    SRCS = Variable to define with autogenerated
-#           source files
-#    HDRS = Variable to define with autogenerated
-#           header files
-#    ARGN = proto files
-#
-#
-#
-# ::
-#
-#   ====================================================================
-
+# ``PROTOBUF_LIBRARY``
+#   The protobuf library
+# ``PROTOBUF_PROTOC_LIBRARY``
+#   The protoc library
+# ``PROTOBUF_INCLUDE_DIR``
+#   The include directory for protocol buffers
+# ``PROTOBUF_PROTOC_EXECUTABLE``
+#   The protoc compiler
+# ``PROTOBUF_LIBRARY_DEBUG``
+#   The protobuf library (debug)
+# ``PROTOBUF_PROTOC_LIBRARY_DEBUG``
+#   The protoc library (debug)
+# ``PROTOBUF_LITE_LIBRARY``
+#   The protobuf lite library
+# ``PROTOBUF_LITE_LIBRARY_DEBUG``
+#   The protobuf lite library (debug)
+#
+# Example:
+#
+# .. code-block:: cmake
+#
+#   find_package(Protobuf REQUIRED)
+#   include_directories(${PROTOBUF_INCLUDE_DIRS})
+#   include_directories(${CMAKE_CURRENT_BINARY_DIR})
+#   protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS foo.proto)
+#   add_executable(bar bar.cc ${PROTO_SRCS} ${PROTO_HDRS})
+#   target_link_libraries(bar ${PROTOBUF_LIBRARIES})
+#
+# .. note::
+#   The PROTOBUF_GENERATE_CPP macro and add_executable() or
+#   add_library() calls only work properly within the same
+#   directory.
+#
+# .. command:: protobuf_generate_cpp
+#
+#   Add custom commands to process ``.proto`` files::
+#
+#     protobuf_generate_cpp (<SRCS> <HDRS> [<ARGN>...])
+#
+#   ``SRCS``
+#     Variable to define with autogenerated source files
+#   ``HDRS``
+#     Variable to define with autogenerated header files
+#   ``ARGN``
+#     ``.proto`` files
 
 #=============================================================================
 # Copyright 2009 Kitware, Inc.

+ 7 - 5
Modules/FindQt4.cmake

@@ -104,9 +104,11 @@
 #   macro QT4_ADD_DBUS_INTERFACES(outfiles inputfile ... )
 #         Create the interface header and implementation files
 #         for all listed interface xml files.
-#         The basename will be automatically determined from the name of the xml file.
+#         The basename will be automatically determined from the name
+#         of the xml file.
 #
-#         The source file properties described for QT4_ADD_DBUS_INTERFACE also apply here.
+#         The source file properties described for
+#         QT4_ADD_DBUS_INTERFACE also apply here.
 #
 #
 # ::
@@ -172,7 +174,7 @@
 #         a class uses the Q_OBJECT macro, moc has to run on it. If you don't
 #         want to use QT4_WRAP_CPP() (which is reliable and mature), you can insert
 #         #include "foo.moc"
-#         in foo.cpp and then give foo.cpp as argument to QT4_AUTOMOC(). This will the
+#         in foo.cpp and then give foo.cpp as argument to QT4_AUTOMOC(). This will
 #         scan all listed files at cmake-time for such included moc files and if it
 #         finds them cause a rule to be generated to run moc at build time on the
 #         accompanying header file foo.h.
@@ -188,8 +190,8 @@
 #         This function is obsolete. Use target_link_libraries with IMPORTED targets
 #         instead.
 #         Make <target> use the <modules> from Qt. Using a Qt module means
-#         to link to the library, add the relevant include directories for the module,
-#         and add the relevant compiler defines for using the module.
+#         to link to the library, add the relevant include directories for the
+#         module, and add the relevant compiler defines for using the module.
 #         Modules are roughly equivalent to components of Qt4, so usage would be
 #         something like:
 #          qt4_use_modules(myexe Core Gui Declarative)

+ 2 - 1
Modules/FindSDL_image.cmake

@@ -11,7 +11,8 @@
 #   SDL_IMAGE_LIBRARIES, the name of the library to link against
 #   SDL_IMAGE_INCLUDE_DIRS, where to find the headers
 #   SDL_IMAGE_FOUND, if false, do not try to link against
-#   SDL_IMAGE_VERSION_STRING - human-readable string containing the version of SDL_image
+#   SDL_IMAGE_VERSION_STRING - human-readable string containing the
+#                              version of SDL_image
 #
 #
 #

+ 2 - 1
Modules/FindSDL_mixer.cmake

@@ -11,7 +11,8 @@
 #   SDL_MIXER_LIBRARIES, the name of the library to link against
 #   SDL_MIXER_INCLUDE_DIRS, where to find the headers
 #   SDL_MIXER_FOUND, if false, do not try to link against
-#   SDL_MIXER_VERSION_STRING - human-readable string containing the version of SDL_mixer
+#   SDL_MIXER_VERSION_STRING - human-readable string containing the
+#                              version of SDL_mixer
 #
 #
 #

+ 3 - 2
Modules/FindSquish.cmake

@@ -41,8 +41,9 @@
 #
 # ::
 #
-#    squish_v4_add_test(cmakeTestName AUT targetName SUITE suiteName TEST squishTestName
-#                    [SETTINGSGROUP group] [PRE_COMMAND command] [POST_COMMAND command] )
+#    squish_v4_add_test(cmakeTestName
+#      AUT targetName SUITE suiteName TEST squishTestName
+#      [SETTINGSGROUP group] [PRE_COMMAND command] [POST_COMMAND command] )
 #
 #
 #