diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2017-03-22 21:49:38 (GMT) |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2017-03-23 15:43:55 (GMT) |
| commit | c51c2cfac619ac9efb9829f8b4decf9756891609 (patch) | |
| tree | 6b9c4a5a4c3c6889ce81d3a6f8b7f6883f24d863 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 060be58c6f9ffe11235341bc10c8f5d808e31b3d (diff) | |
| download | CMake-c51c2cfac619ac9efb9829f8b4decf9756891609.zip CMake-c51c2cfac619ac9efb9829f8b4decf9756891609.tar.gz CMake-c51c2cfac619ac9efb9829f8b4decf9756891609.tar.bz2 | |
Apple: Fix Resources location for all generators
Issue: #16680
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index bd0f55b..39f7b8f 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1200,9 +1200,8 @@ bool cmGlobalXCodeGenerator::CreateXCodeTargets( this->CreateString("2147483647")); copyFilesBuildPhase->AddAttribute("dstSubfolderSpec", this->CreateString("7")); - const std::string dstPath = mit->first.substr(strlen("Resources/")); copyFilesBuildPhase->AddAttribute("dstPath", - this->CreateString(dstPath)); + this->CreateString(mit->first)); copyFilesBuildPhase->AddAttribute("runOnlyForDeploymentPostprocessing", this->CreateString("0")); buildFiles = this->CreateObject(cmXCodeObject::OBJECT_LIST); @@ -3701,6 +3700,12 @@ bool cmGlobalXCodeGenerator::UseEffectivePlatformName(cmMakefile* mf) const return cmSystemTools::IsOn(epnValue); } +bool cmGlobalXCodeGenerator::ShouldStripResourcePath(cmMakefile*) const +{ + // Xcode determines Resource location itself + return true; +} + void cmGlobalXCodeGenerator::ComputeTargetObjectDirectory( cmGeneratorTarget* gt) const { |