Merge topic 'ios-framework-resource-layout'

e76ee2c0 iOS: Fix framework resource directory layout (#15848)
This commit is contained in:
Brad King
2015-12-04 09:54:09 -05:00
committed by CMake Topic Stage
9 changed files with 107 additions and 16 deletions

View File

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