[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5365-g8edd796

[Brad King]

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  8edd796a825a5e069209e970064bbeed1a675225 (commit)
       via  ab7a69b7318163136032432cf01122d3d93f6363 (commit)
       via  eea02763880cf78d033e713e1f7254a60fd44dc8 (commit)
      from  5ec479646713160d72463e3e8cdf32624b4b6824 (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=8edd796a825a5e069209e970064bbeed1a675225
commit 8edd796a825a5e069209e970064bbeed1a675225
Merge: 5ec4796 ab7a69b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 19 11:56:08 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 11:56:08 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    ab7a69b Help: Do not reference non-existent CMAKE_TOOLCHAIN_FILE docs
    eea0276 Help: Fix CMAKE_SYSROOT doc formatting


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab7a69b7318163136032432cf01122d3d93f6363
commit ab7a69b7318163136032432cf01122d3d93f6363
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 19 11:55:52 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 19 11:55:52 2013 -0500

    Help: Do not reference non-existent CMAKE_TOOLCHAIN_FILE docs

diff --git a/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst b/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
index 5c161dc..86c0b0e 100644
--- a/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
+++ b/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
@@ -9,5 +9,5 @@ to specify the location of such tools.  CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN
 may be set to a path to a path to the external toolchain and will be passed
 to the compiler driver if supported.
 
-This variable may only be set in a toolchain file. See the
-:variable:`CMAKE_TOOLCHAIN_FILE` variable for details.
+This variable may only be set in a toolchain file specified by
+the ``CMAKE_TOOLCHAIN_FILE`` variable.
diff --git a/Help/variable/CMAKE_LANG_COMPILER_TARGET.rst b/Help/variable/CMAKE_LANG_COMPILER_TARGET.rst
index c0661ab..7c8efee 100644
--- a/Help/variable/CMAKE_LANG_COMPILER_TARGET.rst
+++ b/Help/variable/CMAKE_LANG_COMPILER_TARGET.rst
@@ -7,5 +7,5 @@ Some compiler drivers are inherently cross-compilers, such as clang and
 QNX qcc. These compiler drivers support a command-line argument to specify
 the target to cross-compile for.
 
-This variable may only be set in a toolchain file. See the
-:variable:`CMAKE_TOOLCHAIN_FILE` variable for details.
+This variable may only be set in a toolchain file specified by
+the ``CMAKE_TOOLCHAIN_FILE`` variable.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eea02763880cf78d033e713e1f7254a60fd44dc8
commit eea02763880cf78d033e713e1f7254a60fd44dc8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 19 11:51:52 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 19 11:51:54 2013 -0500

    Help: Fix CMAKE_SYSROOT doc formatting
    
    Use ``inline-literal`` markup to ensure the --sysroot flag renders
    correctly.  Do not link to CMAKE_TOOLCHAIN_FILE variable documentation
    that does not yet exist.

diff --git a/Help/variable/CMAKE_SYSROOT.rst b/Help/variable/CMAKE_SYSROOT.rst
index 31ef60a..e42e63a 100644
--- a/Help/variable/CMAKE_SYSROOT.rst
+++ b/Help/variable/CMAKE_SYSROOT.rst
@@ -1,12 +1,12 @@
 CMAKE_SYSROOT
 -------------
 
-Path to pass to the compiler in the --sysroot flag.
+Path to pass to the compiler in the ``--sysroot`` flag.
 
-The CMAKE_SYSROOT content is passed to the compiler in the --sysroot
+The ``CMAKE_SYSROOT`` content is passed to the compiler in the ``--sysroot``
 flag, if supported.  The path is also stripped from the RPATH/RUNPATH if
-necessary on installation.  The CMAKE_SYSROOT is also used to prefix
+necessary on installation.  The ``CMAKE_SYSROOT`` is also used to prefix
 paths searched by the ``find_*`` commands.
 
-This variable may only be set in a toolchain file. See the
-:variable:`CMAKE_TOOLCHAIN_FILE` variable for details.
+This variable may only be set in a toolchain file specified by
+the ``CMAKE_TOOLCHAIN_FILE`` variable.

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

Summary of changes:
 .../CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst     |    4 ++--
 Help/variable/CMAKE_LANG_COMPILER_TARGET.rst       |    4 ++--
 Help/variable/CMAKE_SYSROOT.rst                    |   10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake