kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Matthew Hanna 2016-05-17 11:53:27 -04:00 committed by Brad King
parent 7d2a0aa76c
commit 5a21557b33
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Platform/AIX.cmake
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)

4
Modules/Platform/HP-UX.cmake
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