diff options
| author | Matthew Hanna <mhanna21@bloomberg.net> | 2016-05-17 15:53:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-05-17 17:36:29 (GMT) |
| commit | 5a21557b339e389d6988895c6322562ff531e5d7 (patch) | |
| tree | b4734b8ac9c8c17cdc1e4f0db846dd6841ddb60c /Modules/Platform | |
| parent | 7d2a0aa76c25d92f1e2a03778f5666bdd7e56b92 (diff) | |
| download | CMake-5a21557b339e389d6988895c6322562ff531e5d7.zip CMake-5a21557b339e389d6988895c6322562ff531e5d7.tar.gz CMake-5a21557b339e389d6988895c6322562ff531e5d7.tar.bz2 | |
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.
Diffstat (limited to 'Modules/Platform')
| -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 |