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 0a95eb978f02a39fff8efa9074b45146d81a57b7 (commit)
via 21a0beacc1d8c452f13453b22f36c91fbbd0a182 (commit)
from 5354df72e26ce7e8180d9b6a17b2374689c67790 (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=0a95eb978f02a39fff8efa9074b45146d81a57b7
commit 0a95eb978f02a39fff8efa9074b45146d81a57b7
Merge: 5354df7 21a0bea
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 4 10:57:37 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jun 4 10:57:37 2013 -0400
Merge topic 'xcode-framework-paths' into next
21a0bea Xcode: Fix framework search paths in STATIC library targets (#14191)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21a0beacc1d8c452f13453b22f36c91fbbd0a182
commit 21a0beacc1d8c452f13453b22f36c91fbbd0a182
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jun 4 09:49:40 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Jun 4 09:49:40 2013 -0400
Xcode: Fix framework search paths in STATIC library targets (#14191)
In commit 2bc22bda (Xcode: Add frameworks search paths from link
dependeny closure, 2012-12-07) we made framework search paths from the
link closure conditional on target type, skipping it on STATIC and
OBJECT library targets that do not actually link. However, the
framework search paths also influence the compile lines (-F options) so
we need them for all target types. The Makefile generator already does
this, as did the Xcode generator prior to the above-mentioned commit.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index b2d325c..0f59c02 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1997,20 +1997,16 @@ void
cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
dirs.Add(incpath.c_str());
}
}
- if(target.GetType() != cmTarget::OBJECT_LIBRARY &&
- target.GetType() != cmTarget::STATIC_LIBRARY)
+ // Add framework search paths needed for linking.
+ if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName))
{
- // Add framework search paths needed for linking.
- if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName))
+ std::vector<std::string> const& fwDirs = cli->GetFrameworkPaths();
+ for(std::vector<std::string>::const_iterator fdi = fwDirs.begin();
+ fdi != fwDirs.end(); ++fdi)
{
- std::vector<std::string> const& fwDirs = cli->GetFrameworkPaths();
- for(std::vector<std::string>::const_iterator fdi = fwDirs.begin();
- fdi != fwDirs.end(); ++fdi)
+ if(emitted.insert(*fdi).second)
{
- if(emitted.insert(*fdi).second)
- {
- fdirs.Add(this->XCodeEscapePath(fdi->c_str()).c_str());
- }
+ fdirs.Add(this->XCodeEscapePath(fdi->c_str()).c_str());
}
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
