[Cmake-commits] CMake branch, next, updated. v2.8.3-675-g7ccae46

[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  7ccae4678f0db4715a359387b9bfa5db4a1ddb9c (commit)
       via  eda7841fd2de59b1dd05cccc5c4996276a2137d2 (commit)
      from  2580aca93d05d60edd4043d290ce59059672f1fd (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=7ccae4678f0db4715a359387b9bfa5db4a1ddb9c
commit 7ccae4678f0db4715a359387b9bfa5db4a1ddb9c
Merge: 2580aca eda7841
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 22 08:50:42 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 22 08:50:42 2010 -0500

    Merge topic 'pgi-mac' into next
    
    eda7841 Pass Mac linker flag through PGI compiler using "-Wl,"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eda7841fd2de59b1dd05cccc5c4996276a2137d2
commit eda7841fd2de59b1dd05cccc5c4996276a2137d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 22 08:43:13 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 22 08:43:13 2010 -0500

    Pass Mac linker flag through PGI compiler using "-Wl,"
    
    The Mac linker defines -headerpad_max_install_names and the GCC
    front-end passes this flag through.  The PGI compiler does not know
    about this flag, so we must use -Wl,-headerpad_max_install_names to pass
    it to the linker instead.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index db0642e..a99ff4a 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -33,8 +33,8 @@ SET(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
 SET(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
 SET(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
 
-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")
 
 IF(HAVE_FLAG_SEARCH_PATHS_FIRST)
   SET(CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
@@ -42,8 +42,8 @@ IF(HAVE_FLAG_SEARCH_PATHS_FIRST)
 ENDIF(HAVE_FLAG_SEARCH_PATHS_FIRST)
 
 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_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
 SET(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
 SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")

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

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


hooks/post-receive
-- 
CMake