mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'non-xcode-framework-layout'

Browse Source 
f6f03ed4 Add test for OSX/iOS Framework directory structure (#15833)
9f053763 Fix iOS Framework directory structure (#15833)
This commit is contained in:
Brad King
2015-11-16 09:22:46 -05:00
committed by CMake Topic Stage
parent 166a61c729 f6f03ed4cc
commit 30b0db7bb5
10 changed files with 143 additions and 3 deletions
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;