瀏覽代碼

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.
Brad King 14 年之前
父節點
當前提交
d30dcf18b9
共有 3 個文件被更改,包括 4 次插入2 次删除
  1. 2 0
      Modules/Platform/AIX-GNU.cmake
  2. 2 0
      Modules/Platform/AIX-XL.cmake
  3. 0 2
      Modules/Platform/AIX.cmake

+ 2 - 0
Modules/Platform/AIX-GNU.cmake

@@ -19,5 +19,7 @@ endif()
 set(__AIX_COMPILER_GNU 1)
 set(__AIX_COMPILER_GNU 1)
 
 
 macro(__aix_compiler_gnu lang)
 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")
   set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-G")
 endmacro()
 endmacro()

+ 2 - 0
Modules/Platform/AIX-XL.cmake

@@ -19,6 +19,8 @@ endif()
 set(__AIX_COMPILER_XL 1)
 set(__AIX_COMPILER_XL 1)
 
 
 macro(__aix_compiler_xl lang)
 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_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_LINK_${lang}_FLAGS "-Wl,-brtl,-bnoipath,-bexpall")  # +s, flag for exe link to use shared lib
   set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS " ")
   set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS " ")

+ 0 - 2
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
 # 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)
 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.
 # 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)