summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-12-16 15:15:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-12-16 15:15:07 (GMT)
commit65db5b4a993937aca84d600d3370eb584a51354a (patch)
tree3db453defff99ddd8ce357682a7625b0a53620f9 /Source
parent2f82798ef88e8d03aa6457e57faebf4fc16d1660 (diff)
parent5d9934312d0b553eafb7c690487215cff7ddedb3 (diff)
downloadCMake-65db5b4a993937aca84d600d3370eb584a51354a.zip
CMake-65db5b4a993937aca84d600d3370eb584a51354a.tar.gz
CMake-65db5b4a993937aca84d600d3370eb584a51354a.tar.bz2
Merge topic 'osx-dependent-libraries'
5d99343 Do not link private dependent shared libraries on OS X > 10.4
Diffstat (limited to 'Source')
-rw-r--r--Source/cmComputeLinkInformation.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index f8ab686..edf6c35 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -161,7 +161,9 @@ listed on the command line.
- On Windows, DLLs are not directly linked, and the import libraries
have no transitive dependencies.
- - On Mac, we need to actually list the transitive dependencies.
+ - On Mac OS X 10.5 and above transitive dependencies are not needed.
+
+ - 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