diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-12 15:26:24 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-04-13 16:10:32 -0400 |
| commit | 2f6f6f0c153f19f7efab96b2a4c3c9c05362372b (patch) | |
| tree | fb29e1fb2755c4d92e5e4e54d3d2cdbceac6517c | |
| parent | 888c8af6cbfcbaffeca2fb65a0da864141ffff7b (diff) | |
| download | cmake-2f6f6f0c153f19f7efab96b2a4c3c9c05362372b.tar.gz | |
Xcode: Use config-specific object library files on link lines
We can do this only with Xcode 5 and above where we list the object
library files in the per-config link line value. On older Xcode
versions we list the object files as sources so that dependencies work
correctly, but that does not allow per-config objects. (Xcode may allow
per-config source exclusion but only by base name.)
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 10343fdd05..57d915619d 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2673,7 +2673,7 @@ void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target) std::string linkObjs; const char* sep = ""; std::vector<cmSourceFile const*> objs; - gt->GetExternalObjects(objs, ""); + gt->GetExternalObjects(objs, configName); for (std::vector<cmSourceFile const*>::const_iterator oi = objs.begin(); oi != objs.end(); ++oi) { if ((*oi)->GetObjectLibrary().empty()) { |