From 9f053763d769780385fbc8e3e936f1c996d2e00a Mon Sep 17 00:00:00 2001 From: Bartosz Kosiorek Date: Thu, 12 Nov 2015 08:44:07 +0100 Subject: Fix iOS Framework directory structure (#15833) Signed-off-by: Gregor Jasny --- Source/cmOSXBundleGenerator.cxx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx index 3c4aa00..934e198 100644 --- a/Source/cmOSXBundleGenerator.cxx +++ b/Source/cmOSXBundleGenerator.cxx @@ -85,15 +85,24 @@ void cmOSXBundleGenerator::CreateFramework( std::string frameworkVersion = this->GT->GetFrameworkVersion(); - // Configure the Info.plist file into the Resources directory. - this->MacContentFolders->insert("Resources"); + // Configure the Info.plist file std::string plist = newoutpath; - plist += "/Resources/Info.plist"; + if (!this->Makefile->PlatformIsAppleIos()) + { + // Put the Info.plist file into the Resources directory. + this->MacContentFolders->insert("Resources"); + plist += "/Resources"; + } + plist += "/Info.plist"; std::string name = cmSystemTools::GetFilenameName(targetName); this->LocalGenerator->GenerateFrameworkInfoPList(this->GT, name, plist.c_str()); + // Generate Versions directory only for MacOSX frameworks + if (this->Makefile->PlatformIsAppleIos()) + return; + // TODO: Use the cmMakefileTargetGenerator::ExtraFiles vector to // drive rules to create these files at build time. std::string oldName; -- cgit v0.12