[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6430-gd1a4be8

[Stephen Kelly]

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  d1a4be8cdfe853108bc99d737f30e849c760d490 (commit)
       via  84e7c67feadde601cb3cbc30e3093e7c6e000c7e (commit)
      from  5226e11c950e8468ba7c5017dfaf14938ea0a5b2 (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=d1a4be8cdfe853108bc99d737f30e849c760d490
commit d1a4be8cdfe853108bc99d737f30e849c760d490
Merge: 5226e11 84e7c67
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 26 09:01:07 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 26 09:01:07 2013 -0500

    Merge topic 'minor-cleanups' into next
    
    84e7c67 Help: Mark some code blocks as containing cmake code.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84e7c67feadde601cb3cbc30e3093e7c6e000c7e
commit 84e7c67feadde601cb3cbc30e3093e7c6e000c7e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Dec 26 14:57:02 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Dec 26 14:59:08 2013 +0100

    Help: Mark some code blocks as containing cmake code.

diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst
index dc301ba..376ec78 100644
--- a/Help/manual/cmake-packages.7.rst
+++ b/Help/manual/cmake-packages.7.rst
@@ -131,7 +131,9 @@ It may also provide a CMake package configuration file::
   <prefix>/lib/cmake/foo-1.2/FooConfig.cmake
 
 with content defining :prop_tgt:`IMPORTED` targets, or defining variables, such
-as::
+as:
+
+.. code-block:: cmake
 
   # ...
   # (compute PREFIX relative to file location)
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 9e26392..2f4e090 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -22,7 +22,9 @@ The :command:`cmake_minimum_required` command does more than report an
 error if a too-old version of CMake is used to build a project.  It
 also sets all policies introduced in that CMake version or earlier to
 NEW behavior.  To manage policies without increasing the minimum required
-CMake version, the :command:`if(POLICY)` command may be used::
+CMake version, the :command:`if(POLICY)` command may be used:
+
+.. code-block:: cmake
 
   if(POLICY CMP0990)
     cmake_policy(SET CMP0990 NEW)
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index fbe546e..97cd650 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -22,17 +22,23 @@ Languages
 
 Languages are enabled by the :command:`project` command. If no project command
 is in the top-level CMakeLists file, one will be implicitly generated. By default
-the enabled languages are C and CXX::
+the enabled languages are C and CXX:
+
+.. code-block:: cmake
 
   project(C_Only C)
 
 A special value of NONE can also be used with the :command:`project` command
-to enable no languages::
+to enable no languages:
+
+.. code-block:: cmake
 
   project(MyProject NONE)
 
 The :command:`enable_language` command can be used to enable languages after the
-:command:`project` command::
+:command:`project` command:
+
+.. code-block:: cmake
 
   enable_language(CXX)
 
@@ -86,7 +92,9 @@ Cross Compiling
 If :manual:`cmake(1)` is invoked with the command line parameter
 ``-DCMAKE_TOOLCHAIN_FILE=path/to/file``, the file will be loaded early to set
 values for the compilers. A typical cross-compiling toolchain has content such
-as::
+as:
+
+.. code-block:: cmake
 
   set(CMAKE_SYSTEM_NAME Linux)
 
@@ -127,7 +135,9 @@ the ``CMAKE_FIND_ROOT_PATH_MODE_*`` variables.
 
 Some compilers are inherently cross compilers, such as Clang and the QNX QCC
 compiler. The :variable:`CMAKE_<LANG>_COMPILER_TARGET` can be set to pass a
-value to those supported compilers when compiling::
+value to those supported compilers when compiling:
+
+.. code-block:: cmake
 
   set(CMAKE_SYSTEM_NAME Linux)
 
@@ -138,7 +148,9 @@ value to those supported compilers when compiling::
   set(CMAKE_CXX_COMPILER clang++)
   set(CMAKE_CXX_COMPILER_TARGET ${triple})
 
-Or, for QCC::
+Or, for QCC:
+
+.. code-block:: cmake
 
   set(CMAKE_SYSTEM_NAME QNX)
 

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-packages.7.rst   |    4 +++-
 Help/manual/cmake-policies.7.rst   |    4 +++-
 Help/manual/cmake-toolchains.7.rst |   24 ++++++++++++++++++------
 3 files changed, 24 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake