[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5178-g33afd1e

[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  33afd1e09a396ab42bf4e5347739b7347e7dc5fb (commit)
       via  544698afde9f2a614b7acdda2598f0e800462f66 (commit)
      from  b9059ab34d8f659bf0cff970f31964f1fc7b38ed (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=33afd1e09a396ab42bf4e5347739b7347e7dc5fb
commit 33afd1e09a396ab42bf4e5347739b7347e7dc5fb
Merge: b9059ab 544698a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 16 09:46:40 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 16 09:46:40 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    544698a Refer to RPATH consistently.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=544698afde9f2a614b7acdda2598f0e800462f66
commit 544698afde9f2a614b7acdda2598f0e800462f66
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 16 15:45:20 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Nov 16 15:45:20 2013 +0100

    Refer to RPATH consistently.

diff --git a/Help/variable/CMAKE_STAGING_PREFIX.rst b/Help/variable/CMAKE_STAGING_PREFIX.rst
index d2ea9a8..c4de7da 100644
--- a/Help/variable/CMAKE_STAGING_PREFIX.rst
+++ b/Help/variable/CMAKE_STAGING_PREFIX.rst
@@ -9,5 +9,5 @@ The CMAKE_STAGING_PREFIX location is also used as a search prefix by the ``find_
 commands. This can be controlled by setting the :variable:`CMAKE_FIND_NO_INSTALL_PREFIX`
 variable.
 
-If any -rpath paths passed to the linker contain the CMAKE_STAGING_PREFIX,
+If any RPATH/RUNPATH entries passed to the linker contain the CMAKE_STAGING_PREFIX,
 the matching path fragments are replaced with the :variable:`CMAKE_INSTALL_PREFIX`.
diff --git a/Help/variable/CMAKE_SYSROOT.rst b/Help/variable/CMAKE_SYSROOT.rst
index dfcb605..31ef60a 100644
--- a/Help/variable/CMAKE_SYSROOT.rst
+++ b/Help/variable/CMAKE_SYSROOT.rst
@@ -4,7 +4,7 @@ CMAKE_SYSROOT
 Path to pass to the compiler in the --sysroot flag.
 
 The CMAKE_SYSROOT content is passed to the compiler in the --sysroot
-flag, if supported.  The path is also stripped from the RPATH if
+flag, if supported.  The path is also stripped from the RPATH/RUNPATH if
 necessary on installation.  The CMAKE_SYSROOT is also used to prefix
 paths searched by the ``find_*`` commands.
 

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

Summary of changes:
 Help/variable/CMAKE_STAGING_PREFIX.rst |    2 +-
 Help/variable/CMAKE_SYSROOT.rst        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake