diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2017-06-29 12:19:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-29 13:52:44 (GMT) |
| commit | c2a6df94ed639de2192c8baf2350efb2a4fd9c50 (patch) | |
| tree | bd67ce25ac2c4adf44f58284f018ad6a30ebff48 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 372de3f8039f69b3a2edcf7120083ec4097f8bd3 (diff) | |
| download | CMake-c2a6df94ed639de2192c8baf2350efb2a4fd9c50.zip CMake-c2a6df94ed639de2192c8baf2350efb2a4fd9c50.tar.gz CMake-c2a6df94ed639de2192c8baf2350efb2a4fd9c50.tar.bz2 | |
Xcode: Use correct Object Library paths for cross-SDK builds
When calculating Object Library paths take a look at the
`XCODE_EMIT_EFFECTIVE_PLATFORM_NAME` property to enable builds with
different SDKs. Otherwise a hard-coded architecture could be chosen.
Fixes: #16040
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 45c1764..9037961 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -147,7 +147,7 @@ cmGlobalXCodeGenerator::cmGlobalXCodeGenerator( this->XcodeBuildCommandInitialized = false; this->ObjectDirArchDefault = "$(CURRENT_ARCH)"; - this->ComputeObjectDirArch(); + this->ObjectDirArch = this->ObjectDirArchDefault; cm->GetState()->SetIsGeneratorMultiConfig(true); } @@ -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)"; } else if (!this->Architectures.empty()) { this->ObjectDirArch = this->Architectures[0]; |