kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix iOS Framework directory structure (#15833) 

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
This commit is contained in:
Bartosz Kosiorek 2015-11-12 08:44:07 +01:00 committed by Gregor Jasny
parent 415863e6d4
commit 9f053763d7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmOSXBundleGenerator.cxx
View File

@ -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;