summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBartosz Kosiorek <bartosz.kosiorek@tomtom.com>2015-12-02 21:34:25 (GMT)
committerBrad King <brad.king@kitware.com>2015-12-03 13:52:09 (GMT)
commite76ee2c006777e268715b39ad71f49e3d18b11a4 (patch)
tree5c913b087d66d2fa5f25b65635b9b2fb9d562a92 /Source
parent6f6897f1aef884963503d8068707cf27fa7d99e7 (diff)
downloadCMake-e76ee2c006777e268715b39ad71f49e3d18b11a4.zip
CMake-e76ee2c006777e268715b39ad71f49e3d18b11a4.tar.gz
CMake-e76ee2c006777e268715b39ad71f49e3d18b11a4.tar.bz2
iOS: Fix framework resource directory layout (#15848)
A typical iOS application bundle (also Framework Bundle) contains the application executable and any resources used by the application (for instance, the application icon, other images, and localized content) in the top-level bundle directory. The same rule applies to Framework Bundles.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGeneratorTarget.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index cc424b4..b05fb41 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3752,7 +3752,11 @@ void cmGeneratorTarget::ConstructSourceFileFlags() const
if(cmSourceFile* sf = this->Makefile->GetSource(*it))
{
SourceFileFlags& flags = this->SourceFlagsMap[sf];
- flags.MacFolder = "Resources";
+ flags.MacFolder = "";
+ if(!this->Makefile->PlatformIsAppleIos())
+ {
+ flags.MacFolder = "Resources";
+ }
flags.Type = cmGeneratorTarget::SourceFileTypeResource;
}
}