[Cmake-commits] CMake branch, next, updated. v2.8.3-1082-g3e8bacc

[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  3e8bacc4b0aeb2c568b347b4109a8f8320d2ae7e (commit)
       via  e498527f1ded497ddaf2d3285ace224f2e013a40 (commit)
      from  251c8514e29c80ac737060487b61f43394dee77c (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=3e8bacc4b0aeb2c568b347b4109a8f8320d2ae7e
commit 3e8bacc4b0aeb2c568b347b4109a8f8320d2ae7e
Merge: 251c851 e498527
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 22 16:31:58 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 22 16:31:58 2010 -0500

    Merge topic 'mac-headerpad_max_install_names-passthru' into next
    
    e498527 Pass Mac linker flag through all compilers with -Wl,


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e498527f1ded497ddaf2d3285ace224f2e013a40
commit e498527f1ded497ddaf2d3285ace224f2e013a40
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 22 16:28:54 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 22 16:28:54 2010 -0500

    Pass Mac linker flag through all compilers with -Wl,
    
    The Mac linker defines flag -headerpad_max_install_names but not all
    front-ends recognize the flag and pass it through (many did in the past,
    such as the Apple port of GCC).  Use the -Wl, option prefix to tell
    front-ends to pass it through without trying to interpret it.

diff --git a/Modules/Platform/Darwin-GNU.cmake b/Modules/Platform/Darwin-GNU.cmake
index f425eb9..8a50a6a 100644
--- a/Modules/Platform/Darwin-GNU.cmake
+++ b/Modules/Platform/Darwin-GNU.cmake
@@ -20,8 +20,8 @@ set(__DARWIN_COMPILER_GNU 1)
 
 macro(__darwin_compiler_gnu lang)
   # GNU does not have -shared on OS X
-  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-dynamiclib -headerpad_max_install_names")
-  set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "-bundle -headerpad_max_install_names")
+  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-dynamiclib -Wl,-headerpad_max_install_names")
+  set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "-bundle -Wl,-headerpad_max_install_names")
 endmacro()
 
 macro(cmake_gnu_has_isysroot lang)
diff --git a/Modules/Platform/Darwin-icc.cmake b/Modules/Platform/Darwin-icc.cmake
index 49aa843..b62036c 100644
--- a/Modules/Platform/Darwin-icc.cmake
+++ b/Modules/Platform/Darwin-icc.cmake
@@ -33,11 +33,11 @@ SET(CMAKE_SHARED_MODULE_PREFIX "lib")
 SET(CMAKE_SHARED_MODULE_SUFFIX ".so")
 SET(CMAKE_MODULE_EXISTS 1)
 SET(CMAKE_DL_LIBS "")
-SET(CMAKE_C_LINK_FLAGS "-headerpad_max_install_names")
-SET(CMAKE_CXX_LINK_FLAGS "-headerpad_max_install_names")
+SET(CMAKE_C_LINK_FLAGS "-Wl,-headerpad_max_install_names")
+SET(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names")
 SET(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
-SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names")
-SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -Wl,-headerpad_max_install_names")
+SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
 SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
 
 

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

Summary of changes:
 Modules/Platform/Darwin-GNU.cmake |    4 ++--
 Modules/Platform/Darwin-icc.cmake |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake