[Cmake-commits] CMake branch, next, updated. v3.5.2-1462-g674c838

[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  674c838e2c93ae2b97ca1ca8defbb1697911d0f3 (commit)
       via  5a21557b339e389d6988895c6322562ff531e5d7 (commit)
      from  42f2a139b38ab735a6bb20a3c330e308dd53d8fa (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=674c838e2c93ae2b97ca1ca8defbb1697911d0f3
commit 674c838e2c93ae2b97ca1ca8defbb1697911d0f3
Merge: 42f2a13 5a21557
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 17 13:36:50 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 17 13:36:50 2016 -0400

    Merge topic 'platform-required-rpath-override' into next
    
    5a21557b AIX,HP: Allow user to override the default runtime path (libpath)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a21557b339e389d6988895c6322562ff531e5d7
commit 5a21557b339e389d6988895c6322562ff531e5d7
Author:     Matthew Hanna <mhanna21 at bloomberg.net>
AuthorDate: Tue May 17 11:53:27 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 17 13:36:29 2016 -0400

    AIX,HP: Allow user to override the default runtime path (libpath)
    
    The `CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH` is used by CMake to always
    append `-Wl,-blibpath:/usr/lib:/lib` to the link line.  This is needed
    by default on these platforms but needs to be overridden in some use
    cases (e.g. an environment in which one maintains versioned shared
    libraries).  Change our logic to set this value only if it not already
    set by the user, project, or toolchain file.

diff --git a/Modules/Platform/AIX.cmake b/Modules/Platform/AIX.cmake
index 58c6483..551a995 100644
--- a/Modules/Platform/AIX.cmake
+++ b/Modules/Platform/AIX.cmake
@@ -8,7 +8,9 @@ set(CMAKE_DL_LIBS "-lld")
 # -Wl,-blibpath:/usr/lib:/lib whether RPATH support is on or not.
 # When our own RPATH is to be added it may be inserted before the
 # "always" paths.
-set(CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH /usr/lib /lib)
+if(NOT DEFINED CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH)
+  set(CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH /usr/lib /lib)
+endif()
 
 # Files named "libfoo.a" may actually be shared libraries.
 set_property(GLOBAL PROPERTY TARGET_ARCHIVES_MAY_BE_SHARED_LIBS 1)
diff --git a/Modules/Platform/HP-UX.cmake b/Modules/Platform/HP-UX.cmake
index 88932ad..9572a7e 100644
--- a/Modules/Platform/HP-UX.cmake
+++ b/Modules/Platform/HP-UX.cmake
@@ -1,4 +1,6 @@
-set(CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH /usr/lib)
+if(NOT DEFINED CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH)
+  set(CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH /usr/lib)
+endif()
 
 if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "ia64")
   set(CMAKE_SHARED_LIBRARY_SUFFIX ".sl")          # .so

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

Summary of changes:
 Modules/Platform/AIX.cmake   |    4 +++-
 Modules/Platform/HP-UX.cmake |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake