kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Xcode: Refactor internal file type extension extraction 

Move it earlier so it can be used for directories too.
This commit is contained in:
Brad King 2014-09-03 10:33:12 -04:00
parent fb8acb74e8
commit 02aa5965e6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalXCodeGenerator.cxx
View File

@ -864,6 +864,13 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
} }
if(fileType.empty()) if(fileType.empty())
{ {
// Compute the extension without leading '.'.
std::string ext = cmSystemTools::GetFilenameLastExtension(fullpath);
if(!ext.empty())
{
ext = ext.substr(1);
}
// If fullpath references a directory, then we need to specify // If fullpath references a directory, then we need to specify
// lastKnownFileType as folder in order for Xcode to be able to // lastKnownFileType as folder in order for Xcode to be able to
// open the contents of the folder. // open the contents of the folder.
@ -875,13 +882,6 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
} }
else else
{ {
// Compute the extension without leading '.'.
std::string ext = cmSystemTools::GetFilenameLastExtension(fullpath);
if(!ext.empty())
{
ext = ext.substr(1);
}
fileType = GetSourcecodeValueFromFileExtension( fileType = GetSourcecodeValueFromFileExtension(
ext, lang, useLastKnownFileType); ext, lang, useLastKnownFileType);
} }