diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-18 13:30:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-18 13:30:53 (GMT) |
| commit | 441dd9a7e448474042c4098c7b89dda615617f3b (patch) | |
| tree | 2c5250f4c5e91687c7d770f94e274a027c503e22 | |
| parent | 1e876b46911928b614ba89e234375f7f8a45d0e2 (diff) | |
| parent | 5a21557b339e389d6988895c6322562ff531e5d7 (diff) | |
| download | CMake-441dd9a7e448474042c4098c7b89dda615617f3b.zip CMake-441dd9a7e448474042c4098c7b89dda615617f3b.tar.gz CMake-441dd9a7e448474042c4098c7b89dda615617f3b.tar.bz2 | |
Merge topic 'platform-required-rpath-override'
5a21557b AIX,HP: Allow user to override the default runtime path (libpath)
| -rw-r--r-- | Modules/Platform/AIX.cmake | 4 | ||||
| -rw-r--r-- | Modules/Platform/HP-UX.cmake | 4 |
2 files changed, 6 insertions, 2 deletions
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 |