summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregor Jasny <gjasny@googlemail.com>2015-12-10 19:43:33 (GMT)
committerGregor Jasny <gjasny@googlemail.com>2015-12-10 19:49:42 (GMT)
commit34f5ef564aa94f2f66f35c708dbfca260b419e4b (patch)
tree979094de064605244f1ccfeccb7c220d01797d5f
parentfc6c5074e800fb7fe3f829564d7a7e284133cdd9 (diff)
downloadCMake-34f5ef564aa94f2f66f35c708dbfca260b419e4b.zip
CMake-34f5ef564aa94f2f66f35c708dbfca260b419e4b.tar.gz
CMake-34f5ef564aa94f2f66f35c708dbfca260b419e4b.tar.bz2
iOS: Fix App Bundle layout
In contrast to OS X the iOS App Bundle layout is a flat structure.
-rw-r--r--Source/cmInstallTargetGenerator.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 59d06f6..c6908c3 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -152,13 +152,19 @@ void cmInstallTargetGenerator::GenerateScriptForConfig(std::ostream& os,
// Handle OSX Bundles.
if(this->Target->IsAppBundleOnApple())
{
+ cmMakefile const* mf = this->Target->Target->GetMakefile();
+
// Install the whole app bundle directory.
type = cmInstallType_DIRECTORY;
literal_args += " USE_SOURCE_PERMISSIONS";
from1 += ".app";
// Tweaks apply to the binary inside the bundle.
- to1 += ".app/Contents/MacOS/";
+ to1 += ".app/";
+ if(!mf->PlatformIsAppleIos())
+ {
+ to1 += "Contents/MacOS/";
+ }
to1 += targetName;
}
else