[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5307-g7d3abad

[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  7d3abad63e29f708dd1161288b07e602715cf384 (commit)
       via  ef0a381c08beb52fcd6db660807f72a87228ec42 (commit)
      from  0f3138417df438043565fb0f30c2e311dd7b5604 (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=7d3abad63e29f708dd1161288b07e602715cf384
commit 7d3abad63e29f708dd1161288b07e602715cf384
Merge: 0f31384 ef0a381
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 18 13:11:40 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 18 13:11:40 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    ef0a381 Expand the FIND_XXX_ROOT documentation regarding CMAKE_STAGING_PREFIX.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef0a381c08beb52fcd6db660807f72a87228ec42
commit ef0a381c08beb52fcd6db660807f72a87228ec42
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 18 19:07:39 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Nov 18 19:07:39 2013 +0100

    Expand the FIND_XXX_ROOT documentation regarding CMAKE_STAGING_PREFIX.

diff --git a/Help/command/FIND_XXX_ROOT.txt b/Help/command/FIND_XXX_ROOT.txt
index 7f80dcb..61519d1 100644
--- a/Help/command/FIND_XXX_ROOT.txt
+++ b/Help/command/FIND_XXX_ROOT.txt
@@ -1,7 +1,9 @@
 The CMake variable CMAKE_FIND_ROOT_PATH specifies one or more
 directories to be prepended to all other search directories.  This
-effectively "re-roots" the entire search under given locations.  By
-default it is empty.
+effectively "re-roots" the entire search under given locations.
+The :variable:`CMAKE_STAGING_PREFIX` is excluded from this re-rooting, because
+it is always a path on the host system. By default the CMAKE_FIND_ROOT_PATH
+is empty.
 
 The :variable:`CMAKE_SYSROOT` variable can also be used to specify exactly one
 directory to use as a prefix.  Setting :variable:`CMAKE_SYSROOT` also has other
@@ -12,10 +14,11 @@ point to the root directory of the target environment and CMake will
 search there too.  By default at first the directories listed in
 CMAKE_FIND_ROOT_PATH are searched, then the :variable:`CMAKE_SYSROOT` directory is
 searched, and then the non-rooted directories will be
-searched.  The default behavior can be adjusted by setting
+searched, and finally the :variable:`CMAKE_STAGING_PREFIX` will be searched.
+The default behavior can be adjusted by setting
 |CMAKE_FIND_ROOT_PATH_MODE_XXX|.  This behavior can be manually
 overridden on a per-call basis.  By using CMAKE_FIND_ROOT_PATH_BOTH
 the search order will be as described above.  If
 NO_CMAKE_FIND_ROOT_PATH is used then CMAKE_FIND_ROOT_PATH will not be
 used.  If ONLY_CMAKE_FIND_ROOT_PATH is used then only the re-rooted
-directories will be searched.
+directories and the :variable:`CMAKE_STAGING_PREFIX` will be searched.

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

Summary of changes:
 Help/command/FIND_XXX_ROOT.txt |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake