diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-02 16:17:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-03-02 16:21:54 (GMT) |
| commit | d30dcf18b9dedcf6744a87793653bc0d94d8a8bb (patch) | |
| tree | 8546a7b03aaa4692d3d00aa8ec158d79281ee7be /Modules/Platform | |
| parent | 89ea7a3d3c9487eb33caaedf1b636e0af092dcc2 (diff) | |
| download | CMake-d30dcf18b9dedcf6744a87793653bc0d94d8a8bb.zip CMake-d30dcf18b9dedcf6744a87793653bc0d94d8a8bb.tar.gz CMake-d30dcf18b9dedcf6744a87793653bc0d94d8a8bb.tar.bz2 | |
Move RPATH flags to AIX per-compiler information files
Move RPATH flags out of Platform/AIX.cmake into platform-specific
compiler information files Platform/AIX-XL and Platform/AIX-GNU.
The flags need to be set for each compiler of each language.
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/AIX-GNU.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/AIX-XL.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/AIX.cmake | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Modules/Platform/AIX-GNU.cmake b/Modules/Platform/AIX-GNU.cmake index 79c06ba..543f3e8 100644 --- a/Modules/Platform/AIX-GNU.cmake +++ b/Modules/Platform/AIX-GNU.cmake @@ -19,5 +19,7 @@ endif() set(__AIX_COMPILER_GNU 1) macro(__aix_compiler_gnu lang) + set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-blibpath:") + set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-G") endmacro() diff --git a/Modules/Platform/AIX-XL.cmake b/Modules/Platform/AIX-XL.cmake index c07f28d..1f94152 100644 --- a/Modules/Platform/AIX-XL.cmake +++ b/Modules/Platform/AIX-XL.cmake @@ -19,6 +19,8 @@ endif() set(__AIX_COMPILER_XL 1) macro(__aix_compiler_xl lang) + set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-blibpath:") + set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-G -Wl,-brtl,-bnoipath") # -shared set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-brtl,-bnoipath,-bexpall") # +s, flag for exe link to use shared lib set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS " ") diff --git a/Modules/Platform/AIX.cmake b/Modules/Platform/AIX.cmake index 0ab0cce..a9f773e 100644 --- a/Modules/Platform/AIX.cmake +++ b/Modules/Platform/AIX.cmake @@ -9,8 +9,6 @@ SET(CMAKE_DL_LIBS "-lld") # 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) -SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-blibpath:") -SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # Files named "libfoo.a" may actually be shared libraries. SET_PROPERTY(GLOBAL PROPERTY TARGET_ARCHIVES_MAY_BE_SHARED_LIBS 1) |