diff options
author | Brad King <brad.king@kitware.com> | 2012-12-07 18:06:20 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2012-12-07 20:14:19 (GMT) |
commit | 2bc22bdaacfc0f0f91c229685dc5dbadd0267601 (patch) | |
tree | 8d38e3a3a2eaacd6d3fc064c0051fcff2c94de31 /Source/cmTarget.cxx | |
parent | 8521a9e9cad06922dc316f2c3a82f0263bbd7e87 (diff) | |
download | CMake-2bc22bdaacfc0f0f91c229685dc5dbadd0267601.zip CMake-2bc22bdaacfc0f0f91c229685dc5dbadd0267601.tar.gz CMake-2bc22bdaacfc0f0f91c229685dc5dbadd0267601.tar.bz2 |
Xcode: Add frameworks search paths from link dependeny closure (#13397)
The Xcode generator produces FRAMEWORK_SEARCH_PATHS from:
(1) Include directories of the form /path/to/Foo.framework become
-F/path/to so '#include <Foo/H>' can find H in the framework.
(2) Linked frameworks of the form /path/to/Foo.framework become
-F/path/to -framework Foo so the linker can find the framework.
Originally commit 82bb6fae (add framework support to FIND_FILE,
2005-12-27) added these and used the (then current) old-style link
dependency analysis results to get the frameworks. Later a second
setting was added by commit 2ed6191f (add initial xcode framework stuff,
2007-05-08) to transform -F/path/to linker options produced by the old
link line generation into entries appended to FRAMEWORK_SEARCH_PATHS.
Then commit 96fd5909 (Implement linking with paths to library files,
2008-01-22) updated the second setting to directly use the results of
full modern link dependency analysis, but forgot to remove the use of
old-style link results from the original setting location.
The two settings worked together for a while, with the second one
appending to the first. Then commit f33a27ab (Generate native Xcode 3.0
and 3.1 projects, 2009-06-29) changed the internal representation format
produced by the first setting but did not update the second setting to
append to the new representation. As a result, if the first setting
added any paths (usually via the old-style link analysis) then the
second setting containing the modern link analysis results would not be
applied at all.
Fix this by removing use of the old-style link analysis results.
Replace it using the modern link dependencies and remove the second
setting altogether. Now all values for FRAMEWORK_SEARCH_PATHS are
collected in one place so no special append logic is needed.
Diffstat (limited to 'Source/cmTarget.cxx')
0 files changed, 0 insertions, 0 deletions