Fix iOS Framework directory structure (#15833)
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
This commit is contained in:
parent
415863e6d4
commit
9f053763d7
|
@ -85,15 +85,24 @@ void cmOSXBundleGenerator::CreateFramework(
|
||||||
|
|
||||||
std::string frameworkVersion = this->GT->GetFrameworkVersion();
|
std::string frameworkVersion = this->GT->GetFrameworkVersion();
|
||||||
|
|
||||||
// Configure the Info.plist file into the Resources directory.
|
// Configure the Info.plist file
|
||||||
this->MacContentFolders->insert("Resources");
|
|
||||||
std::string plist = newoutpath;
|
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);
|
std::string name = cmSystemTools::GetFilenameName(targetName);
|
||||||
this->LocalGenerator->GenerateFrameworkInfoPList(this->GT,
|
this->LocalGenerator->GenerateFrameworkInfoPList(this->GT,
|
||||||
name,
|
name,
|
||||||
plist.c_str());
|
plist.c_str());
|
||||||
|
|
||||||
|
// Generate Versions directory only for MacOSX frameworks
|
||||||
|
if (this->Makefile->PlatformIsAppleIos())
|
||||||
|
return;
|
||||||
|
|
||||||
// TODO: Use the cmMakefileTargetGenerator::ExtraFiles vector to
|
// TODO: Use the cmMakefileTargetGenerator::ExtraFiles vector to
|
||||||
// drive rules to create these files at build time.
|
// drive rules to create these files at build time.
|
||||||
std::string oldName;
|
std::string oldName;
|
||||||
|
|
Loading…
Reference in New Issue