[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5174-g3766f02

[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  3766f02c8a2b556e154665f1b1f63512df4bc7d8 (commit)
       via  567a11e2995bb23d50b280e351e6aa281c332a2e (commit)
      from  a94c6b4d82a8c9edf90a72e623341136d3ba8a88 (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=3766f02c8a2b556e154665f1b1f63512df4bc7d8
commit 3766f02c8a2b556e154665f1b1f63512df4bc7d8
Merge: a94c6b4 567a11e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 15 12:56:29 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 15 12:56:29 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    567a11e Don't install to CMAKE_SYSROOT/CMAKE_INSTALL_PREFIX by default.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=567a11e2995bb23d50b280e351e6aa281c332a2e
commit 567a11e2995bb23d50b280e351e6aa281c332a2e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 15 18:54:58 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Nov 15 18:54:58 2013 +0100

    Don't install to CMAKE_SYSROOT/CMAKE_INSTALL_PREFIX by default.

diff --git a/Help/command/FIND_XXX_ROOT.txt b/Help/command/FIND_XXX_ROOT.txt
index b44ee2a..7f80dcb 100644
--- a/Help/command/FIND_XXX_ROOT.txt
+++ b/Help/command/FIND_XXX_ROOT.txt
@@ -3,14 +3,14 @@ directories to be prepended to all other search directories.  This
 effectively "re-roots" the entire search under given locations.  By
 default it is empty.
 
-The variable CMAKE_SYSROOT can also be used to specify exactly one
-directory to use as a prefix.  Setting CMAKE_SYSROOT also has other
+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
 effects.  See the documentation for that variable for more.
 
 These variables are especially useful when cross-compiling to
 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 CMAKE_SYSROOT directory is
+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
 |CMAKE_FIND_ROOT_PATH_MODE_XXX|.  This behavior can be manually
diff --git a/Help/variable/CMAKE_SYSROOT.rst b/Help/variable/CMAKE_SYSROOT.rst
index c4a2306..dfcb605 100644
--- a/Help/variable/CMAKE_SYSROOT.rst
+++ b/Help/variable/CMAKE_SYSROOT.rst
@@ -6,11 +6,7 @@ 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
 necessary on installation.  The CMAKE_SYSROOT is also used to prefix
-paths searched by the ``find_*`` commands.  The CMAKE_SYSROOT is also
-prefixed to the :variable:`CMAKE_INSTALL_PREFIX` so that the final
-install prefix used is '${CMAKE_SYSROOT}/${CMAKE_INSTALL_PREFIX}'.  As
-an alternative, the :variable:`CMAKE_STAGING_PREFIX` can be set to a location
-on the host filesystem to override the final installation location.
+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.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 6376e4e..b736307 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -377,13 +377,6 @@ void cmLocalGenerator::GenerateInstallRules()
     {
     prefix = stagingPrefix;
     }
-  else if (!sysrootted.empty())
-    {
-    sysrootted += "/";
-    sysrootted += prefix;
-    cmSystemTools::ConvertToUnixSlashes(sysrootted);
-    prefix = sysrootted.c_str();
-    }
 
   // Compute the set of configurations.
   std::vector<std::string> configurationTypes;

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

Summary of changes:
 Help/command/FIND_XXX_ROOT.txt  |    6 +++---
 Help/variable/CMAKE_SYSROOT.rst |    6 +-----
 Source/cmLocalGenerator.cxx     |    7 -------
 3 files changed, 4 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake