diff options
author | Brad King <brad.king@kitware.com> | 2014-01-09 19:06:05 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-01-09 19:06:05 (GMT) |
commit | 67fd61b0615221b76437a6f6fe07fa51876c45b3 (patch) | |
tree | 9634c2e5d7716d78da91b7c494ae1345a542c20b /Source | |
parent | 5e3458830e49e432d31b0aad8a86e35be640afdc (diff) | |
parent | 93fc5a53a6252e1ef14894b7e6eb8e69c20858b6 (diff) | |
download | CMake-67fd61b0615221b76437a6f6fe07fa51876c45b3.zip CMake-67fd61b0615221b76437a6f6fe07fa51876c45b3.tar.gz CMake-67fd61b0615221b76437a6f6fe07fa51876c45b3.tar.bz2 |
Merge branch 'xcode-storyboard-file-type-2.8.12' into release
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 0a2b32b..c181c59 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -877,8 +877,10 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath( } std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang); - - fileRef->AddAttribute("explicitFileType", + const char* attribute = (sourcecode == "file.storyboard") ? + "lastKnownFileType" : + "explicitFileType"; + fileRef->AddAttribute(attribute, this->CreateString(sourcecode.c_str())); // Store the file path relative to the top of the source tree. |