From ec75578883d28fa3365aa481eb2150b98768b633 Mon Sep 17 00:00:00 2001 From: Amit D Date: Fri, 16 Jun 2023 12:31:54 +0300 Subject: [PATCH] CMakeLists.txt: Remove remainng 'cxx' Fix #698 --- CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2859e425a..84f9dfc38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,7 +231,7 @@ set(libs_private "${libs_private} -lm") # # ############################################################################## -if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +if(CMAKE_C_COMPILER_ID MATCHES "Clang") set(CLANG 1) endif() @@ -247,12 +247,10 @@ else() endif() include(CheckCCompilerFlag) -include(CheckCXXCompilerFlag) # Check for valid compiler flags macro(CHECK_CCXX_COMPILER_FLAG flag_ result_) check_c_compiler_flag(${flag_} C_HAS${result_}) - check_cxx_compiler_flag(${flag_} CXX_HAS${result_}) endmacro() if(MSVC) @@ -260,7 +258,7 @@ if(MSVC) add_compile_options("$<$:/W1;/Ox>") add_compile_options("$<$:/W4;/DDEBUG>") if(NOT CLANG) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP") endif() else() if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]") @@ -279,9 +277,6 @@ else() if(C_HAS${flag_var}) set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${flag_}") endif() - if(CXX_HAS${flag_var}) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${flag_}") - endif() endforeach() add_definitions(-DDEBUG) endif()