diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-30 14:31:51 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-30 14:32:02 (GMT) |
| commit | 15c5d9a0dd6961f908ffd30bc32471905a3d2bda (patch) | |
| tree | a8d021d9418a7804ff1c64161011da3c850a88cd /Source | |
| parent | bcca01d8adea0441fde4bd3f243ce43b70bb9cf6 (diff) | |
| parent | c2a6df94ed639de2192c8baf2350efb2a4fd9c50 (diff) | |
| download | CMake-15c5d9a0dd6961f908ffd30bc32471905a3d2bda.zip CMake-15c5d9a0dd6961f908ffd30bc32471905a3d2bda.tar.gz CMake-15c5d9a0dd6961f908ffd30bc32471905a3d2bda.tar.bz2 | |
Merge topic 'xcode-cross-sdk-object-libraries'
c2a6df94 Xcode: Use correct Object Library paths for cross-SDK builds
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1016
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 44fc7f4..4be3c80 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]; diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index f38fa3c..e69793b 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/Source/cmGlobalXCodeGenerator.h @@ -247,7 +247,7 @@ private: const cmGeneratorTarget* t) const; void ComputeArchitectures(cmMakefile* mf); - void ComputeObjectDirArch(); + void ComputeObjectDirArch(cmMakefile* mf); void addObject(cmXCodeObject* obj); std::string PostBuildMakeTarget(std::string const& tName, |