diff options
| author | Brad King <brad.king@kitware.com> | 2003-12-12 19:35:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-12-12 19:35:18 (GMT) |
| commit | c1add9106c5a382d3e668dc2ea99ccfd7163c96e (patch) | |
| tree | 9a90edcd50285f00cfc987eea75e8a34124ed119 /Modules/Platform | |
| parent | 9a096e8488e13021920f68ce69c38445c0487f44 (diff) | |
| download | CMake-c1add9106c5a382d3e668dc2ea99ccfd7163c96e.zip CMake-c1add9106c5a382d3e668dc2ea99ccfd7163c96e.tar.gz CMake-c1add9106c5a382d3e668dc2ea99ccfd7163c96e.tar.bz2 | |
ENH: Using separate CMAKE_SHARED_LIBRARY_SONAME flags for C and CXX.
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Linux.cmake | 3 | ||||
| -rw-r--r-- | Modules/Platform/SunOS.cmake | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake index ec699bd..02c809e 100644 --- a/Modules/Platform/Linux.cmake +++ b/Modules/Platform/Linux.cmake @@ -7,4 +7,5 @@ SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") SET(CMAKE_SHARED_LIBRARY_LINK_FLAGS "-rdynamic") SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-rpath,") SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":") -SET(CMAKE_SHARED_LIBRARY_SONAME_FLAG "-Wl,-soname,") +SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") +SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,") diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake index 2f5edb6..ea2ecd9 100644 --- a/Modules/Platform/SunOS.cmake +++ b/Modules/Platform/SunOS.cmake @@ -3,7 +3,8 @@ IF(CMAKE_SYSTEM MATCHES "SunOS-4.*") SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-r") SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-R") SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":") - SET(CMAKE_SHARED_LIBRARY_SONAME_FLAG "-h") + SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h") + SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h") ENDIF(CMAKE_SYSTEM MATCHES "SunOS-4.*") IF(CMAKE_SYSTEM MATCHES "SunOS-5*.") @@ -11,7 +12,8 @@ IF(CMAKE_SYSTEM MATCHES "SunOS-5*.") SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-G") SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-R") SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":") - SET(CMAKE_SHARED_LIBRARY_SONAME_FLAG "-h") + SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-h") + SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-h") SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-KPIC") SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-G") SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-R") @@ -21,20 +23,21 @@ IF(CMAKE_SYSTEM MATCHES "SunOS-5*.") SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG "-Wl,-R") SET(CMAKE_SHARED_LIBRARY_RUNTIME_FLAG_SEP ":") - SET(CMAKE_SHARED_LIBRARY_SONAME_FLAG "-Wl,-h") + SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-h") ENDIF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_SHARED_LIBRARY_CXX_FLAGS "-fPIC") SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-shared") SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG "-Wl,-R") SET(CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP ":") + SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-h") ENDIF(CMAKE_COMPILER_IS_GNUCXX) ENDIF(CMAKE_SYSTEM MATCHES "SunOS-5*.") IF(CMAKE_COMPILER_IS_GNUCXX) IF(CMAKE_COMPILER_IS_GNUCC) SET(CMAKE_CXX_CREATE_SHARED_LIBRARY - "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") ELSE(CMAKE_COMPILER_IS_GNUCC) # Take default rule from CMakeDefaultMakeRuleVariables.cmake. ENDIF(CMAKE_COMPILER_IS_GNUCC) |