Merge topic 'platform-required-rpath-override'

5a21557b AIX,HP: Allow user to override the default runtime path (libpath)
This commit is contained in:
Brad King 2016-05-18 09:30:53 -04:00 committed by CMake Topic Stage
commit 441dd9a7e4
2 changed files with 6 additions and 2 deletions

View File

@ -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)

View File

@ -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