[Cmake-commits] CMake branch, next, updated. v2.8.1-1322-g6870c21

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6870c219f2d1e60bcfa5d402e5a9de4277b8ee3b (commit)
       via  693f98c10565d169c1879f6be37339828eb044bc (commit)
       via  2847d86c68590f8b330bd97b3f78f7033a3c87e0 (commit)
       via  c06dae9e6792efb5727635eb2c667b6822579b5f (commit)
      from  f24a357c54e940dbfc0670d1b66f75f146910206 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6870c219f2d1e60bcfa5d402e5a9de4277b8ee3b
commit 6870c219f2d1e60bcfa5d402e5a9de4277b8ee3b
Merge: f24a357 693f98c
Author: Brad King <brad.king at kitware.com>
Date:   Mon Jun 7 10:18:19 2010 -0400

    Merge branch 'sunCC-5.11-rpath-link' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=693f98c10565d169c1879f6be37339828eb044bc
commit 693f98c10565d169c1879f6be37339828eb044bc
Author: Brad King <brad.king at kitware.com>
Date:   Mon Jun 7 10:13:33 2010 -0400

    Fix rpath-link flag for SunPro C++ 5.11 on Linux
    
    Commit 82c081ba (Fix rpath-link flag for SunPro C++ on Linux,
    2009-07-13) taught CMake to pass '-rpath-link' because SunPro C++ 5.9
    does not support '-Wl,'.  Now SunPro C++ 5.11 does not recognize the
    option without using '-Wl,'.  Detect whether to use '-Wl,' based on the
    output of "sunCC -flags".

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")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Linux-SunPro-CXX.cmake |    9 ++++++++-
 Source/kwsys/kwsysDateStamp.cmake       |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake