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 | 602f2118b083f998cd7523efcdd5f39689eb15ac (patch) | |
| tree | afb62e2fde5674cce60331f28000969a0f6263df | |
| parent | 2a2c890023c7cfc643d8390a07bffe7676556b32 (diff) | |
| parent | 1e68fb0c91dd3f4fa64053601e878b1ffde1b439 (diff) | |
| download | CMake-602f2118b083f998cd7523efcdd5f39689eb15ac.zip CMake-602f2118b083f998cd7523efcdd5f39689eb15ac.tar.gz CMake-602f2118b083f998cd7523efcdd5f39689eb15ac.tar.bz2 | |
Merge topic 'xcode-objc' into release-3.16
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 6cbd4f3..3002b2a 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -942,6 +942,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") { |