[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5303-g001adbe

[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  001adbe01be33c62a1f811752372fc1614656eeb (commit)
       via  bfa1166dbf8367d4c401e3b7981e8cacbac124d5 (commit)
      from  9ca25bb17bb98f31c536a5ccdf3cb80464dfb039 (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=001adbe01be33c62a1f811752372fc1614656eeb
commit 001adbe01be33c62a1f811752372fc1614656eeb
Merge: 9ca25bb bfa1166
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 18 12:53:48 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 18 12:53:48 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    bfa1166 Add explanatory comment.


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

    Add explanatory comment.

diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 233e0f9..c4663ef 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -440,6 +440,9 @@ void cmFindCommon::ComputeFinalPaths()
   // Expand list of paths inside all search roots.
   this->RerootPaths(paths);
 
+  // Process the CMAKE_STAGING_PREFIX after re-rooting the paths.
+  // The CMAKE_STAGING_PREFIX is always a host path, so it should never
+  // be re-rooted onto the CMAKE_SYSROOT or the CMAKE_FIND_ROOT_PATH entries.
   if(const char* stagePrefix =
       this->Makefile->GetDefinition("CMAKE_STAGING_PREFIX"))
     {

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

Summary of changes:
 Source/cmFindCommon.cxx |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake