From 9a7b4f47aa3cf4ce03aad117d2e1de893c34acb0 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 6 Nov 2019 15:26:38 +0100 Subject: ObjC: Mark explicitly the language for compilation This way you can have .cpp files compiled as ObjC++. Fixes: #19926 --- Modules/CMakeOBJCInformation.cmake | 2 +- Modules/CMakeOBJCXXInformation.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/CMakeOBJCInformation.cmake b/Modules/CMakeOBJCInformation.cmake index 2baad4a..cb61cb8 100644 --- a/Modules/CMakeOBJCInformation.cmake +++ b/Modules/CMakeOBJCInformation.cmake @@ -165,7 +165,7 @@ endif() # compile an Objective-C file into an object file if(NOT CMAKE_OBJC_COMPILE_OBJECT) set(CMAKE_OBJC_COMPILE_OBJECT - " -o -c ") + " -x objective-c -o -c ") endif() if(NOT CMAKE_OBJC_LINK_EXECUTABLE) diff --git a/Modules/CMakeOBJCXXInformation.cmake b/Modules/CMakeOBJCXXInformation.cmake index 3f55b01..71ac26a 100644 --- a/Modules/CMakeOBJCXXInformation.cmake +++ b/Modules/CMakeOBJCXXInformation.cmake @@ -258,7 +258,7 @@ endif() # compile an Objective-C++ file into an object file if(NOT CMAKE_OBJCXX_COMPILE_OBJECT) set(CMAKE_OBJCXX_COMPILE_OBJECT - " -o -c ") + " -x objective-c++ -o -c ") endif() if(NOT CMAKE_OBJCXX_LINK_EXECUTABLE) -- cgit v0.12