[Cmake-commits] CMake branch, next, updated. v2.8.6-2217-gf767b8c

[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  f767b8cca32bfda3e5fa35b612c8591e7908e326 (commit)
       via  2d0cc11ef348f8f772ca68be5a1cd40f8320037d (commit)
      from  deb2cfdd5b2a37a79452de9aafe3a62f95ebf20d (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=f767b8cca32bfda3e5fa35b612c8591e7908e326
commit f767b8cca32bfda3e5fa35b612c8591e7908e326
Merge: deb2cfd 2d0cc11
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 08:14:18 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 15 08:14:18 2011 -0500

    Merge topic 'osx-dependent-libraries' into next
    
    2d0cc11 Link private dependent shared libraries on OS X < 10.4


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d0cc11ef348f8f772ca68be5a1cd40f8320037d
commit 2d0cc11ef348f8f772ca68be5a1cd40f8320037d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 15 08:08:10 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 15 08:08:10 2011 -0500

    Link private dependent shared libraries on OS X < 10.4
    
    Fix parent commit to preserve the workaround on OS X 10.3 and below too.

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 34eb3f4..867c788 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -187,7 +187,7 @@ IF(XCODE)
   SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
 ENDIF(XCODE)
 
-IF(_CURRENT_OSX_VERSION STREQUAL "10.4")
+IF("${_CURRENT_OSX_VERSION}" VERSION_LESS "10.5")
   # Need to list dependent shared libraries on link line.  When building
   # with -isysroot (for universal binaries), the linker always looks for
   # dependent libraries under the sysroot.  Listing them on the link
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 4c7f221..edf6c35 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -163,7 +163,7 @@ listed on the command line.
 
   - On Mac OS X 10.5 and above transitive dependencies are not needed.
 
-  - On Mac OS X 10.4 we need to actually list the transitive dependencies.
+  - On Mac OS X 10.4 and below we need to actually list the dependencies.
     Otherwise when using -isysroot for universal binaries it cannot
     find the dependent libraries.  Listing them on the command line
     tells the linker where to find them, but unfortunately also links

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

Summary of changes:
 Modules/Platform/Darwin.cmake       |    2 +-
 Source/cmComputeLinkInformation.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake