[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5299-gc5dda3e

[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  c5dda3ef9d021ec6a2cddd2b45328160c8476f9e (commit)
       via  00fb01a742aaf6dfb73d08625ddb6bd080c7528c (commit)
      from  8e900ea793d3833c29967845d2a48fc676cf1f7c (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=c5dda3ef9d021ec6a2cddd2b45328160c8476f9e
commit c5dda3ef9d021ec6a2cddd2b45328160c8476f9e
Merge: 8e900ea 00fb01a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 18 12:45:30 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 18 12:45:30 2013 -0500

    Merge topic 'cross-compiling-toolchain-variables' into next
    
    00fb01a Ignore empty CMAKE_STAGING_PREFIX.


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

    Ignore empty CMAKE_STAGING_PREFIX.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 894e75d..0ef3d2e 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1920,7 +1920,7 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
           {
           d = d.substr(rootPath.size());
           }
-        else if (stagePath && d.find(stagePath) == 0)
+        else if (stagePath && *stagePath && d.find(stagePath) == 0)
           {
           std::string suffix = d.substr(strlen(stagePath));
           d = installPrefix;
@@ -1948,7 +1948,7 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
             {
             d = d.substr(rootPath.size());
             }
-          else if (stagePath && d.find(stagePath) == 0)
+          else if (stagePath && *stagePath && d.find(stagePath) == 0)
             {
             std::string suffix = d.substr(strlen(stagePath));
             d = installPrefix;

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

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


hooks/post-receive
-- 
CMake