diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-08 14:58:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-01-08 14:58:43 (GMT) |
| commit | 9551b85a907c10867c466b3cd4d26904acea48f0 (patch) | |
| tree | 55cff024810c626be7866f3b215eadb34ec3580d /Source | |
| parent | afbac9f2d8d6e5fe8393b65b72fb7624d45a3d60 (diff) | |
| parent | e361c3cb18254a61ed86d21ef6b3e3b53b4316b3 (diff) | |
| download | CMake-9551b85a907c10867c466b3cd4d26904acea48f0.zip CMake-9551b85a907c10867c466b3cd4d26904acea48f0.tar.gz CMake-9551b85a907c10867c466b3cd4d26904acea48f0.tar.bz2 | |
Merge topic 'xcode-storyboard-file-type'
e361c3c Merge branch 'xcode-storyboard-file-type-2.8.12' into xcode-storyboard-file-type
93fc5a5 Xcode: Fix storyboard view
2d23c1f Xcode: Fix storyboard view
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 381c1f5..eef49db 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -876,7 +876,10 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath( else { 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())); } |