From 1107f489fadb1ad34f0c01c6b6a1e47306557b54 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 13 Nov 2016 15:11:46 -0800 Subject: Change src/CMakeLists.txt to notice c++ as g++ --- src/CMakeLists.txt | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 65e58edb..46e1f8e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -138,20 +138,24 @@ set(LEDGER_INCLUDES ${PROJECT_BINARY_DIR}/system.hh) if (CMAKE_BUILD_TYPE STREQUAL "Debug") - if ((CMAKE_CXX_COMPILER MATCHES "clang") OR (CMAKE_CXX_COMPILER MATCHES "cxx")) + if ((CMAKE_CXX_COMPILER MATCHES "clang") OR + (CMAKE_CXX_COMPILER MATCHES "clang++") OR + (CMAKE_CXX_COMPILER MATCHES "cxx")) add_definitions( - -Weverything - -Wno-disabled-macro-expansion - -Wno-padded - -Wno-weak-vtables - -Wno-exit-time-destructors - -Wno-global-constructors - -Wno-switch-enum - -Wno-missing-prototypes - -Wno-missing-noreturn - -Wno-unused-parameter - -Wno-c++98-compat - -fno-limit-debug-info) + # -Weverything + # -Wno-disabled-macro-expansion + # -Wno-padded + # -Wno-weak-vtables + # -Wno-exit-time-destructors + # -Wno-global-constructors + # -Wno-switch-enum + # -Wno-missing-prototypes + # -Wno-missing-noreturn + # -Wno-unused-parameter + # -Wno-c++98-compat + # -fno-limit-debug-info + --system-header-prefix=include/boost/ + --system-header-prefix=boost/) macro(ADD_PCH_RULE _header_filename _src_list _other_srcs) set(_pch_filename "${_header_filename}.pch") @@ -189,7 +193,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug") DEPENDS ${_header_filename}) endmacro(ADD_PCH_RULE _header_filename _src_list _other_srcs) - elseif(CMAKE_CXX_COMPILER MATCHES "g\\+\\+") + elseif ((CMAKE_CXX_COMPILER MATCHES "g\\+\\+") OR + (CMAKE_CXX_COMPILER MATCHES "c\\+\\+")) set(GXX_WARNING_FLAGS -pedantic -Wall -- cgit v1.2.3