[Cmake-commits] CMake branch, next, updated. v3.4.1-1985-ge37e3f1

[Brad King]

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  e37e3f18ca209a04568c1d40420fb385fff71aad (commit)
       via  012b6469f84e2b8cef1b457c1185ed0d97209a80 (commit)
      from  3f6e32535b336418d834e583f5731832c1b1dd85 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e37e3f18ca209a04568c1d40420fb385fff71aad
commit e37e3f18ca209a04568c1d40420fb385fff71aad
Merge: 3f6e325 012b646
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 15 14:53:20 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 15 14:53:20 2016 -0500

    Merge topic 'rpath-preserve-compiler-defined' into next
    
    012b6469 fixup! install: Do not remove compiler-defined RPATH entries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=012b6469f84e2b8cef1b457c1185ed0d97209a80
commit 012b6469f84e2b8cef1b457c1185ed0d97209a80
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 15 14:53:12 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 15 14:53:12 2016 -0500

    fixup! install: Do not remove compiler-defined RPATH entries

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 0994032..a89a6e0b 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2695,7 +2695,7 @@ bool cmSystemTools::ChangeRPath(std::string const& file,
   // If the resulting rpath is empty, just remove the entire entry instead.
   if (remove_rpath)
     {
-    return RemoveRPath(file, emsg, changed);
+    return cmSystemTools::RemoveRPath(file, emsg, changed);
     }
 
   {

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

Summary of changes:
 Source/cmSystemTools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake