From 11378ff72814b0443d017329cd53adeb320c1509 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Thu, 29 Sep 2016 12:44:29 +0200
Subject: [PATCH] Remove -Wno-deprecated-declarations from top-most flags.
Subdirs / modules still add it.
---
cmake/modules/CheckCompiler.cmake | 8 +-------
config/Makefile.linux | 2 +-
config/Makefile.linuxarm64 | 2 +-
config/Makefile.linuxx32gcc | 2 +-
config/Makefile.linuxx8664gcc | 2 +-
5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/cmake/modules/CheckCompiler.cmake b/cmake/modules/CheckCompiler.cmake
index 0821887e3b6..3fb0a4e166c 100644
--- a/cmake/modules/CheckCompiler.cmake
+++ b/cmake/modules/CheckCompiler.cmake
@@ -163,19 +163,13 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_THREAD_FLAG}")
if(cxx11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- if(CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
- endif()
if(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations -Wc++11-narrowing -Wsign-compare -Wsometimes-uninitialized -Wconditional-uninitialized -Wheader-guard -Warray-bounds -Wcomment -Wtautological-compare -Wstrncat-size -Wloop-analysis -Wbool-conversion")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wc++11-narrowing -Wsign-compare -Wsometimes-uninitialized -Wconditional-uninitialized -Wheader-guard -Warray-bounds -Wcomment -Wtautological-compare -Wstrncat-size -Wloop-analysis -Wbool-conversion")
endif()
endif()
if(cxx14)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
- if(CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
- endif()
endif()
if(libcxx)
diff --git a/config/Makefile.linux b/config/Makefile.linux
index f955d316d91..94a52e897d4 100644
--- a/config/Makefile.linux
+++ b/config/Makefile.linux
@@ -24,7 +24,7 @@ CXX = g++
CC = gcc
CXXFLAGS = -pipe -m32 -msse -mfpmath=sse -Wall -W \
-Woverloaded-virtual -fPIC -msse -mfpmath=sse \
- $(CXX11FLAGS) -Wno-deprecated-declarations \
+ $(CXX11FLAGS) \
$(EXTRA_CXXFLAGS) $(USERCONF_CXXFLAGS)
CFLAGS = -pipe -m32 -msse -mfpmath=sse -Wall -W -fPIC $(EXTRA_CFLAGS) $(USERCONF_CFLAGS)
CLINGCXXFLAGS = -m32 -msse -mfpmath=sse
diff --git a/config/Makefile.linuxarm64 b/config/Makefile.linuxarm64
index 1f425922ff7..12377723880 100644
--- a/config/Makefile.linuxarm64
+++ b/config/Makefile.linuxarm64
@@ -24,7 +24,7 @@ endif
CXX = g++
CC = gcc
CXXFLAGS = -pipe -fsigned-char -Wshadow -Wall -W -Woverloaded-virtual \
- -fPIC $(EXTRA_CXXFLAGS) $(CXX11FLAGS) -Wno-deprecated-declarations $(USERCONF_CXXFLAGS)
+ -fPIC $(EXTRA_CXXFLAGS) $(CXX11FLAGS) $(USERCONF_CXXFLAGS)
CFLAGS = -pipe -fsigned-char -Wshadow -Wall -W -fPIC $(EXTRA_CFLAGS) $(USERCONF_CFLAGS)
COMPILER = gnu
diff --git a/config/Makefile.linuxx32gcc b/config/Makefile.linuxx32gcc
index 26b299dcb1f..3cba43b4bb3 100644
--- a/config/Makefile.linuxx32gcc
+++ b/config/Makefile.linuxx32gcc
@@ -25,7 +25,7 @@ CXX = g++
CC = gcc
CXXFLAGS = $(CXX11FLAGS) -pipe -mx32 -Wshadow -Wall -W -Woverloaded-virtual \
-fPIC -msse -mfpmath=sse $(EXTRA_CXXFLAGS) \
- -Wno-deprecated-declarations $(USERCONF_CXXFLAGS)
+ $(USERCONF_CXXFLAGS)
CFLAGS = -pipe -mx32 -Wshadow -Wall -W -fPIC $(EXTRA_CFLAGS) $(USERCONF_CFLAGS)
COMPILER = gnu
diff --git a/config/Makefile.linuxx8664gcc b/config/Makefile.linuxx8664gcc
index b2f8c2a5c6e..743c4b590ae 100644
--- a/config/Makefile.linuxx8664gcc
+++ b/config/Makefile.linuxx8664gcc
@@ -27,7 +27,7 @@ CXX ?= g++
CC ?= gcc
CXXFLAGS = -pipe -m64 $(CXX11FLAGS) -Wshadow -Wall -W -Woverloaded-virtual \
-fPIC $(EXTRA_CXXFLAGS) \
- -Wno-deprecated-declarations $(USERCONF_CXXFLAGS)
+ $(USERCONF_CXXFLAGS)
CFLAGS = -pipe -m64 -Wshadow -Wall -W -fPIC $(EXTRA_CFLAGS) $(USERCONF_CFLAGS)
COMPILER = gnu
--
GitLab