diff options
| author | Brad King <brad.king@kitware.com> | 2010-06-08 13:23:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-06-08 13:23:11 (GMT) |
| commit | 6f9bb934d41912ee0e9beb6a34edecf5667f0fe5 (patch) | |
| tree | a48de9f56b600a5697a0d80864cc1bd379b6b1c1 | |
| parent | ddf0de132b680e5794406f4d698a0e5262926dd8 (diff) | |
| parent | 25619a87fc134839fb593a30d775469feeb6a39f (diff) | |
| download | CMake-6f9bb934d41912ee0e9beb6a34edecf5667f0fe5.zip CMake-6f9bb934d41912ee0e9beb6a34edecf5667f0fe5.tar.gz CMake-6f9bb934d41912ee0e9beb6a34edecf5667f0fe5.tar.bz2 | |
Merge branch 'sunCC-5.11-rpath-link'
| -rw-r--r-- | ChangeLog.manual | 1 | ||||
| -rw-r--r-- | Modules/Platform/Linux-SunPro-CXX.cmake | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog.manual b/ChangeLog.manual index 44181a9..29162e9 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -54,6 +54,7 @@ Changes since CMake 2.8.1 - Recognize Clang compiler - Search basic directories on "Generic" platform - Set MSVC* variables consistently on all generators, and test +- Support SunPro C++ 5.11 on Linux (new compiler) - Support VS 10 Express (related to #10670) - Support compression with 'cmake -E tar' - Support multiple arguments in CC,CXX,FC environment variables diff --git a/Modules/Platform/Linux-SunPro-CXX.cmake b/Modules/Platform/Linux-SunPro-CXX.cmake index 5490473..8ee9658 100644 --- a/Modules/Platform/Linux-SunPro-CXX.cmake +++ b/Modules/Platform/Linux-SunPro-CXX.cmake @@ -1,2 +1,9 @@ -SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG "-rpath-link ") +# Sun C++ 5.9 does not support -Wl, but Sun C++ 5.11 does not work without it. +# Query the compiler flags to detect whether to use -Wl. +execute_process(COMMAND ${CMAKE_CXX_COMPILER} -flags OUTPUT_VARIABLE _cxx_flags ERROR_VARIABLE _cxx_error) +if("${_cxx_flags}" MATCHES "\n-W[^\n]*component") + set(CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG "-Wl,-rpath-link,") +else() + set(CMAKE_SHARED_LIBRARY_RPATH_LINK_CXX_FLAG "-rpath-link ") +endif() SET(CMAKE_EXE_EXPORTS_CXX_FLAG "--export-dynamic") |