diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2017-02-26 21:14:34 (GMT) |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2017-03-22 20:16:42 (GMT) |
| commit | 484ccb0c454afa36da6b36e4ca5e0258e1739b3d (patch) | |
| tree | 993e64caf0fc72af4d18ab23cf54dffe07f8097e /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 9a733c7bd626f457a71632da46934995da7bbd4b (diff) | |
| download | CMake-484ccb0c454afa36da6b36e4ca5e0258e1739b3d.zip CMake-484ccb0c454afa36da6b36e4ca5e0258e1739b3d.tar.gz CMake-484ccb0c454afa36da6b36e4ca5e0258e1739b3d.tar.bz2 | |
Xcode: Properly handle non-resource Bundle files on iOS
Issue: #16680
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 77f3408..3f5dde7 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1154,8 +1154,12 @@ bool cmGlobalXCodeGenerator::CreateXCodeTargets( // dstPath in frameworks is relative to Versions/<version> ostr << mit->first; } else if (mit->first != "MacOS") { - // dstPath in bundles is relative to Contents/MacOS - ostr << "../" << mit->first.c_str(); + if (gtgt->Target->GetMakefile()->PlatformIsAppleIos()) { + ostr << mit->first; + } else { + // dstPath in bundles is relative to Contents/MacOS + ostr << "../" << mit->first; + } } copyFilesBuildPhase->AddAttribute("dstPath", this->CreateString(ostr.str())); |