Merge topic 'xcode-objc'

1e68fb0c91 Xcode: Set source file type for Objective C/C++

Acked-by: Kitware Robot <[email protected]>
Merge-request: !4073

Source/cmGlobalXCodeGenerator.cxx

@@ -944,6 +944,10 @@ std::string GetSourcecodeValueFromFileExtension(const std::string& _ext,
     sourcecode += ".cpp.cpp";
   } else if (lang == "C") {
     sourcecode += ".c.c";
+  } else if (lang == "OBJCXX") {
+    sourcecode += ".cpp.objcpp";
+  } else if (lang == "OBJC") {
+    sourcecode += ".c.objc";
   } else if (lang == "Fortran") {
     sourcecode += ".fortran.f90";
   } else if (lang == "ASM") {