[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5166-g2d92fef

[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  2d92fefddff8650c47ecbc58aca0ee5d556c041a (commit)
       via  875b87fcdcf922a4f7cdadb74e6e7e3d93caa33f (commit)
      from  199c16830f5ac7fb7af97a24871976cb62d9503e (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=2d92fefddff8650c47ecbc58aca0ee5d556c041a
commit 2d92fefddff8650c47ecbc58aca0ee5d556c041a
Merge: 199c168 875b87f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 15 06:49:58 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 15 06:49:58 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    875b87f Process staging prefix even if root prefix is not set.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=875b87fcdcf922a4f7cdadb74e6e7e3d93caa33f
commit 875b87fcdcf922a4f7cdadb74e6e7e3d93caa33f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Nov 15 12:48:48 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Nov 15 12:48:48 2013 +0100

    Process staging prefix even if root prefix is not set.
    
    In the case of QNX, the sysroot does not need to be set.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 1d44efa..7f5e57d 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1916,11 +1916,11 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
       if(use_build_rpath)
         {
         std::string d = *ri;
-        if (d.find(rootPath) == 0)
+        if (!rootPath.empty() && d.find(rootPath) == 0)
           {
           d = d.substr(rootPath.size());
           }
-        else if (d.find(stagePath) == 0)
+        else if (stagePath && d.find(stagePath) == 0)
           {
           std::string suffix = d.substr(strlen(stagePath));
           d = installPrefix;
@@ -1944,11 +1944,11 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
            !cmSystemTools::IsSubDirectory(ri->c_str(), topBinaryDir))
           {
           std::string d = *ri;
-          if (d.find(rootPath) == 0)
+          if (!rootPath.empty() && d.find(rootPath) == 0)
             {
             d = d.substr(rootPath.size());
             }
-          else if (d.find(stagePath) == 0)
+          else if (stagePath && d.find(stagePath) == 0)
             {
             std::string suffix = d.substr(strlen(stagePath));
             d = installPrefix;

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

Summary of changes:
 Source/cmComputeLinkInformation.cxx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake