kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sunCC-5.11-rpath-link'

This commit is contained in:
Brad King 2010-06-08 09:23:11 -04:00
parent ddf0de132b 25619a87fc
commit 6f9bb934d4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.manual
View File

@ -54,6 +54,7 @@ Changes since CMake 2.8.1
- Recognize Clang compiler - Recognize Clang compiler
- Search basic directories on "Generic" platform - Search basic directories on "Generic" platform
- Set MSVC* variables consistently on all generators, and test - 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 VS 10 Express (related to #10670)
- Support compression with 'cmake -E tar' - Support compression with 'cmake -E tar'
- Support multiple arguments in CC,CXX,FC environment variables - Support multiple arguments in CC,CXX,FC environment variables

9
Modules/Platform/Linux-SunPro-CXX.cmake
View File

@ -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") SET(CMAKE_EXE_EXPORTS_CXX_FLAG "--export-dynamic")