From ad4341a9e2b866d82e1a63bfd2f1d74515335de1 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 27 Apr 2022 21:58:42 +0200 Subject: [PATCH 1/1] Cosmetics: gcc is now always >= 5.0. --- tools/cmake/Flags.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/cmake/Flags.cmake b/tools/cmake/Flags.cmake index 1df11955f3..3741f5f533 100644 --- a/tools/cmake/Flags.cmake +++ b/tools/cmake/Flags.cmake @@ -15,11 +15,8 @@ set(warnCXXFLAGS "") if(enable_compile_warnings) set(warnCFLAGS "-fno-common -Wall -Wunused -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing") - if(CMAKE_COMPILER_IS_GNUCC AND (NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS "5.0"))) - set(warnCFLAGS "${warnCFLAGS} -Wformat-signedness") - endif() if(CMAKE_COMPILER_IS_GNUCC) - set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized") + set(warnCFLAGS "${warnCFLAGS} -Wclobbered -Wformat-signedness -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized") endif() if (CMAKE_CXX_COMPILER_ID MATCHES "Intel") # ignore remarks: @@ -36,11 +33,8 @@ if(enable_compile_warnings) endif() set(warnCXXFLAGS "${warnCFLAGS} -Wall -Wextra -Wunused -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing") - if(CMAKE_COMPILER_IS_GNUCXX AND (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0"))) - set(warnCFLAGS "${warnCFLAGS} -Wformat-signedness") - endif() if(CMAKE_COMPILER_IS_GNUCXX) - set(warnCXXFLAGS "${warnCXXFLAGS} -Wclobbered -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized") + set(warnCXXFLAGS "${warnCXXFLAGS} -Wclobbered -Wformat-signedness -Wno-error=clobbered -Wno-unused-local-typedefs -Wno-error=attributes -Wno-error=maybe-uninitialized") endif() if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0") # workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81767 -- 2.20.1