Merge topic 'platform-required-rpath-override'
5a21557b
AIX,HP: Allow user to override the default runtime path (libpath)
This commit is contained in:
commit
441dd9a7e4
|
@ -8,7 +8,9 @@ set(CMAKE_DL_LIBS "-lld")
|
||||||
# -Wl,-blibpath:/usr/lib:/lib whether RPATH support is on or not.
|
# -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
|
# When our own RPATH is to be added it may be inserted before the
|
||||||
# "always" paths.
|
# "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.
|
# Files named "libfoo.a" may actually be shared libraries.
|
||||||
set_property(GLOBAL PROPERTY TARGET_ARCHIVES_MAY_BE_SHARED_LIBS 1)
|
set_property(GLOBAL PROPERTY TARGET_ARCHIVES_MAY_BE_SHARED_LIBS 1)
|
||||||
|
|
|
@ -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")
|
if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "ia64")
|
||||||
set(CMAKE_SHARED_LIBRARY_SUFFIX ".sl") # .so
|
set(CMAKE_SHARED_LIBRARY_SUFFIX ".sl") # .so
|
||||||
|
|
Loading…
Reference in New Issue