mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Xcode: Remove dependency Makefile hacks under the "new build system"

Browse Source 
The original Xcode build system did not properly re-link targets that consumed
object libraies.  We worked around that with a post-build command on the object
libraries themselves that removed their consumers if out of date.  The "new
build system" does not appear to need such help, so drop the workaround.
This commit is contained in:
Brad King
2020-09-24 08:52:53 -04:00
parent c6c7f6fbeb
commit 0a67c3ebe1
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/cmGlobalXCodeGenerator.cxx
View File

@@ -621,10 +621,14 @@ void cmGlobalXCodeGenerator::AddExtraTargets(
root->AddGeneratorTarget(cm::make_unique<cmGeneratorTarget>(allbuild, root));
// Add XCODE depend helper
std::string dir = root->GetCurrentBinaryDirectory();
cmCustomCommandLines commandLines = cmMakeSingleCommandLine(
{ "make", "-C", dir, "-f", this->CurrentXCodeHackMakefile,
"OBJDIR=$(OBJDIR)", /* placeholder, see below */ "" });
std::string legacyDependHelperDir = root->GetCurrentBinaryDirectory();
cmCustomCommandLines legacyDependHelperCommandLines;
if (this->XcodeBuildSystem == BuildSystem::One) {
legacyDependHelperCommandLines = cmMakeSingleCommandLine(
{ "make", "-C", legacyDependHelperDir, "-f",
this->CurrentXCodeHackMakefile, "OBJDIR=$(OBJDIR)",
/* placeholder, see below */ "" });
}
// Add ZERO_CHECK
bool regenerate = !this->GlobalSettingIsOn("CMAKE_SUPPRESS_REGENERATION");
@@ -663,15 +667,15 @@ void cmGlobalXCodeGenerator::AddExtraTargets(
// run the depend check makefile as a post build rule
// this will make sure that when the next target is built
// things are up-to-date
if (isGenerateProject &&
if (this->XcodeBuildSystem == BuildSystem::One && isGenerateProject &&
target->GetType() == cmStateEnums::OBJECT_LIBRARY) {
commandLines.front().back() = // fill placeholder
legacyDependHelperCommandLines.front().back() = // fill placeholder
this->PostBuildMakeTarget(target->GetName(), "$(CONFIGURATION)");
gen->AddCustomCommandToTarget(
target->GetName(), no_byproducts, no_depends, commandLines,
cmCustomCommandType::POST_BUILD, "Depend check for xcode",
dir.c_str(), true, false, "", "", false,
cmObjectLibraryCommands::Accept);
target->GetName(), no_byproducts, no_depends,
legacyDependHelperCommandLines, cmCustomCommandType::POST_BUILD,
"Depend check for xcode", legacyDependHelperDir.c_str(), true, false,
"", "", false, cmObjectLibraryCommands::Accept);
}
if (!this->IsExcluded(gens[0], target.get())) {
@@ -3985,7 +3989,9 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
for (auto t : targets) {
this->AddDependAndLinkInformation(t);
}
this->CreateXCodeDependHackMakefile(targets);
if (this->XcodeBuildSystem == BuildSystem::One) {
this->CreateXCodeDependHackMakefile(targets);
}
// now add all targets to the root object
cmXCodeObject* allTargets = this->CreateObject(cmXCodeObject::OBJECT_LIST);
for (auto t : targets) {