From 02aa5965e6b4b82b5e8b893beadc56069d4a7ebb Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 3 Sep 2014 10:33:12 -0400 Subject: Xcode: Refactor internal file type extension extraction Move it earlier so it can be used for directories too. --- Source/cmGlobalXCodeGenerator.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index ee5fc00..1c3d358 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -864,6 +864,13 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath( } 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 // lastKnownFileType as folder in order for Xcode to be able to // open the contents of the folder. @@ -875,13 +882,6 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath( } else { - // Compute the extension without leading '.'. - std::string ext = cmSystemTools::GetFilenameLastExtension(fullpath); - if(!ext.empty()) - { - ext = ext.substr(1); - } - fileType = GetSourcecodeValueFromFileExtension( ext, lang, useLastKnownFileType); } -- cgit v0.12