|
@@ -2092,6 +2092,12 @@ void cmGlobalXCodeGenerator
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // Skip link information for static libraries.
|
|
|
|
|
+ if(cmtarget->GetType() == cmTarget::STATIC_LIBRARY)
|
|
|
|
|
+ {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// Loop over configuration types and set per-configuration info.
|
|
// Loop over configuration types and set per-configuration info.
|
|
|
for(std::vector<std::string>::iterator i =
|
|
for(std::vector<std::string>::iterator i =
|
|
|
this->CurrentConfigurationTypes.begin();
|
|
this->CurrentConfigurationTypes.begin();
|
|
@@ -2166,29 +2172,28 @@ void cmGlobalXCodeGenerator
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// now add the link libraries
|
|
// now add the link libraries
|
|
|
- if(cmtarget->GetType() != cmTarget::STATIC_LIBRARY)
|
|
|
|
|
- {
|
|
|
|
|
- std::string linkLibs;
|
|
|
|
|
- const char* sep = "";
|
|
|
|
|
- typedef cmComputeLinkInformation::ItemVector ItemVector;
|
|
|
|
|
- ItemVector const& libNames = cli.GetItems();
|
|
|
|
|
- for(ItemVector::const_iterator li = libNames.begin();
|
|
|
|
|
- li != libNames.end(); ++li)
|
|
|
|
|
|
|
+ {
|
|
|
|
|
+ std::string linkLibs;
|
|
|
|
|
+ const char* sep = "";
|
|
|
|
|
+ typedef cmComputeLinkInformation::ItemVector ItemVector;
|
|
|
|
|
+ ItemVector const& libNames = cli.GetItems();
|
|
|
|
|
+ for(ItemVector::const_iterator li = libNames.begin();
|
|
|
|
|
+ li != libNames.end(); ++li)
|
|
|
|
|
+ {
|
|
|
|
|
+ linkLibs += sep;
|
|
|
|
|
+ sep = " ";
|
|
|
|
|
+ if(li->IsPath)
|
|
|
{
|
|
{
|
|
|
- linkLibs += sep;
|
|
|
|
|
- sep = " ";
|
|
|
|
|
- if(li->IsPath)
|
|
|
|
|
- {
|
|
|
|
|
- linkLibs += this->XCodeEscapePath(li->Value.c_str());
|
|
|
|
|
- }
|
|
|
|
|
- else
|
|
|
|
|
- {
|
|
|
|
|
- linkLibs += li->Value;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ linkLibs += this->XCodeEscapePath(li->Value.c_str());
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ linkLibs += li->Value;
|
|
|
}
|
|
}
|
|
|
- this->AppendBuildSettingAttribute(target, "OTHER_LDFLAGS",
|
|
|
|
|
- linkLibs.c_str(), configName);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ this->AppendBuildSettingAttribute(target, "OTHER_LDFLAGS",
|
|
|
|
|
+ linkLibs.c_str(), configName);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|