From 25a610a7a3a06ca9bd49a463e306970c2791c931 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 18 Jun 2020 00:40:43 +0300 Subject: [PATCH] Remove broken compiler flags detection, specify explicitly based on compiler --- CMakeLists.txt | 17 +++++------------ cmake/AppendCXXFlagIfSupported.cmake | 15 --------------- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 cmake/AppendCXXFlagIfSupported.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index c831586..eb57dbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,19 +73,12 @@ ELSE(MSVC) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=${SDL2PP_CXXSTD}") SET(SDL2PP_WARNINGS "${SDL2PP_WARNINGS} -Wall -Wextra -pedantic") - INCLUDE(AppendCXXFlagIfSupported) + IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + SET(SDL2PP_WARNINGS "${SDL2PP_WARNINGS} -Wmissing-prototypes -Wtautological-compare -Wshorten-64-to-32") - # enable for more cleanups - #APPEND_CXX_FLAG_IF_SUPPORTED(-Weverything SDL2PP_WARNINGS) - - # always enables some -Weverything warnings - APPEND_CXX_FLAG_IF_SUPPORTED(-Wmissing-prototypes SDL2PP_WARNINGS) - APPEND_CXX_FLAG_IF_SUPPORTED(-Wtautological-compare SDL2PP_WARNINGS) - APPEND_CXX_FLAG_IF_SUPPORTED(-Wshorten-64-to-32 SDL2PP_WARNINGS) - - # disable some -Weverything warnings - #APPEND_CXX_FLAG_IF_SUPPORTED(-Wno-c++98-compat SDL2PP_WARNINGS) - #APPEND_CXX_FLAG_IF_SUPPORTED(-Wno-padded SDL2PP_WARNINGS) + # For adventurous + #SET(SDL2PP_WARNINGS "${SDL2PP_WARNINGS} -Weverything -Wno-c++98-compat -Wno-padded") + ENDIF() ENDIF(MSVC) LIST(REMOVE_DUPLICATES SDL2_ALL_INCLUDE_DIRS) diff --git a/cmake/AppendCXXFlagIfSupported.cmake b/cmake/AppendCXXFlagIfSupported.cmake deleted file mode 100644 index ee38818..0000000 --- a/cmake/AppendCXXFlagIfSupported.cmake +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDE(CheckCXXCompilerFlag) - -MACRO(APPEND_CXX_FLAG_IF_SUPPORTED FLAG VARIABLE) - UNSET(HAS_FLAG CACHE) - SET(SAVED_CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET}) - SET(CMAKE_REQUIRED_QUIET YES) - CHECK_CXX_COMPILER_FLAG(${FLAG} HAS_FLAG) - SET(CMAKE_REQUIRED_QUIET ${SAVED_CMAKE_REQUIRED_QUIET}) - IF(HAS_FLAG) - SET(${VARIABLE} "${${VARIABLE}} ${FLAG}") - MESSAGE(STATUS "Checking for ${FLAG}: yes") - ELSE(HAS_FLAG) - MESSAGE(STATUS "Checking for ${FLAG}: no") - ENDIF(HAS_FLAG) -ENDMACRO(APPEND_CXX_FLAG_IF_SUPPORTED)