summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-09-03 14:33:50 (GMT)
committerBrad King <brad.king@kitware.com>2014-09-03 14:33:50 (GMT)
commit8eacc3390a2b9a9fb6e5df2cec9b9b8da0354961 (patch)
treef44552ba303c5cc9441f82d4c6ad79c65ce14d30 /Source/cmGlobalXCodeGenerator.cxx
parent02aa5965e6b4b82b5e8b893beadc56069d4a7ebb (diff)
downloadCMake-8eacc3390a2b9a9fb6e5df2cec9b9b8da0354961.zip
CMake-8eacc3390a2b9a9fb6e5df2cec9b9b8da0354961.tar.gz
CMake-8eacc3390a2b9a9fb6e5df2cec9b9b8da0354961.tar.bz2
Xcode: Reference '.xcassets' folders as assetcatalog (#15125)
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1c3d358..3625449 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -877,7 +877,7 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
// (Xcode 4.6 does not like explicitFileType=folder).
if(cmSystemTools::FileIsDirectory(fullpath.c_str()))
{
- fileType = "folder";
+ fileType = (ext == "xcassets"? "folder.assetcatalog" : "folder");
useLastKnownFileType = true;
}
else