diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-21 16:27:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-21 16:27:25 (GMT) |
| commit | 51d83d4955bd225555c018ff99299a224ba94452 (patch) | |
| tree | 8bfb76ca9cb877ea5f4c6ccbca21642c7cf25489 | |
| parent | ad815939c9b3f604c68a636c88f4842e1ab22129 (diff) | |
| parent | 1e68fb0c91dd3f4fa64053601e878b1ffde1b439 (diff) | |
| download | CMake-51d83d4955bd225555c018ff99299a224ba94452.zip CMake-51d83d4955bd225555c018ff99299a224ba94452.tar.gz CMake-51d83d4955bd225555c018ff99299a224ba94452.tar.bz2 | |
Merge topic 'xcode-objc'
1e68fb0c91 Xcode: Set source file type for Objective C/C++
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4073
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 40e8d48..9e6741d 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/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") { |