diff options
| author | Brad King <brad.king@kitware.com> | 2015-12-04 14:54:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-12-04 14:54:09 (GMT) |
| commit | d4767fca963e97ec2147a343e24ec366cc2646cb (patch) | |
| tree | b83db9e3a7139ef4dbbd5e5733dcd9f9ae7ff0ba /Source | |
| parent | 7410e2ed61851385d0c06dd174a4782a54c44ab0 (diff) | |
| parent | e76ee2c006777e268715b39ad71f49e3d18b11a4 (diff) | |
| download | CMake-d4767fca963e97ec2147a343e24ec366cc2646cb.zip CMake-d4767fca963e97ec2147a343e24ec366cc2646cb.tar.gz CMake-d4767fca963e97ec2147a343e24ec366cc2646cb.tar.bz2 | |
Merge topic 'ios-framework-resource-layout'
e76ee2c0 iOS: Fix framework resource directory layout (#15848)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index cc424b4..b05fb41 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -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; } } |