Commit bc92960b authored by Brad King's avatar Brad King
Browse files

Merge branch 'xcode-cross-sdk-object-libraries' into release-3.9

parents 594b0f80 c2a6df94
...@@ -147,7 +147,7 @@ cmGlobalXCodeGenerator::cmGlobalXCodeGenerator( ...@@ -147,7 +147,7 @@ cmGlobalXCodeGenerator::cmGlobalXCodeGenerator(
this->XcodeBuildCommandInitialized = false; this->XcodeBuildCommandInitialized = false;
this->ObjectDirArchDefault = "$(CURRENT_ARCH)"; this->ObjectDirArchDefault = "$(CURRENT_ARCH)";
this->ComputeObjectDirArch(); this->ObjectDirArch = this->ObjectDirArchDefault;
cm->GetState()->SetIsGeneratorMultiConfig(true); cm->GetState()->SetIsGeneratorMultiConfig(true);
} }
...@@ -3087,12 +3087,12 @@ void cmGlobalXCodeGenerator::ComputeArchitectures(cmMakefile* mf) ...@@ -3087,12 +3087,12 @@ void cmGlobalXCodeGenerator::ComputeArchitectures(cmMakefile* mf)
} }
} }
this->ComputeObjectDirArch(); this->ComputeObjectDirArch(mf);
} }
void cmGlobalXCodeGenerator::ComputeObjectDirArch() void cmGlobalXCodeGenerator::ComputeObjectDirArch(cmMakefile* mf)
{ {
if (this->Architectures.size() > 1) { if (this->Architectures.size() > 1 || this->UseEffectivePlatformName(mf)) {
this->ObjectDirArch = "$(CURRENT_ARCH)"; this->ObjectDirArch = "$(CURRENT_ARCH)";
} else if (!this->Architectures.empty()) { } else if (!this->Architectures.empty()) {
this->ObjectDirArch = this->Architectures[0]; this->ObjectDirArch = this->Architectures[0];
......
...@@ -247,7 +247,7 @@ private: ...@@ -247,7 +247,7 @@ private:
const cmGeneratorTarget* t) const; const cmGeneratorTarget* t) const;
void ComputeArchitectures(cmMakefile* mf); void ComputeArchitectures(cmMakefile* mf);
void ComputeObjectDirArch(); void ComputeObjectDirArch(cmMakefile* mf);
void addObject(cmXCodeObject* obj); void addObject(cmXCodeObject* obj);
std::string PostBuildMakeTarget(std::string const& tName, std::string PostBuildMakeTarget(std::string const& tName,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment