Refactor common switches into file

2019-02-21 18:48:53 +01:00
parent 106727a5b9
commit 473e928106
4 changed files with 18 additions and 30 deletions
@@ -0,0 +1,9 @@
+QMAKE_CXXFLAGS += -Wextra
+
+QMAKE_CXXFLAGS += -Wshadow
+
+QMAKE_CXXFLAGS += -Wold-style-cast
+
+QMAKE_CXXFLAGS += -Wnon-virtual-dtor
+
+QMAKE_CXXFLAGS += -Wcast-align -Wunused -Woverloaded-virtual -Wformat=2
@@ -8,17 +8,10 @@ include(common-msvc.pri)
 #clang-msvc does not enable the c++17 flag with qmake's c++1z flag.
 QMAKE_CXXFLAGS += /std:c++17

-QMAKE_CXXFLAGS += -Wextra -Wmost
+include(clang-gcc-common-switches.pri)

-QMAKE_CXXFLAGS += -Wshadow
+QMAKE_CXXFLAGS += -Wmost

-QMAKE_CXXFLAGS += -Wold-style-cast
-
-QMAKE_CXXFLAGS += -Wnon-virtual-dtor
-
-#QMAKE_CXXFLAGS += -Wpedantic
-
-QMAKE_CXXFLAGS += -Wcast-align -Wunused -Woverloaded-virtual -Wformat=2
 #QMAKE_CXXFLAGS += -Wconversion
 #QMAKE_CXXFLAGS += -Wdouble-promotion
 #QMAKE_CXXFLAGS +=  -Wsign-conversion
@@ -1,15 +1,9 @@
-QMAKE_CXXFLAGS += -Wextra -Wmost
+include(clang-gcc-common-switches.pri)
+
+QMAKE_CXXFLAGS += -Wmost
+
+QMAKE_CXXFLAGS += -Wpedantic

 QMAKE_CXXFLAGS += -Werror
 #All includes from the third-party directory will not warn.
 QMAKE_CXXFLAGS += --system-header-prefix=third-party
-
-QMAKE_CXXFLAGS += -Wshadow
-
-QMAKE_CXXFLAGS += -Wold-style-cast
-
-QMAKE_CXXFLAGS += -Wnon-virtual-dtor
-
-QMAKE_CXXFLAGS += -Wpedantic
-
-QMAKE_CXXFLAGS += -Wcast-align -Wunused -Woverloaded-virtual -Wformat=2
@@ -1,19 +1,11 @@
 #g++-7 is needed for C++17 features. travis does not supply this by default.
 QMAKE_CXX = g++-7

-QMAKE_CXXFLAGS += -Wextra
-
-QMAKE_CXXFLAGS += -Werror
-
-QMAKE_CXXFLAGS += -Wshadow
-
-QMAKE_CXXFLAGS += -Wold-style-cast
-
-QMAKE_CXXFLAGS += -Wnon-virtual-dtor
+include(clang-gcc-common-switches.pri)

 QMAKE_CXXFLAGS += -Wpedantic

-QMAKE_CXXFLAGS += -Wcast-align -Wunused -Woverloaded-virtual -Wformat=2
+QMAKE_CXXFLAGS += -Werror

 # GCC only switches
 QMAKE_CXXFLAGS += -Wduplicated-branches -Wduplicated-cond -Wlogical-op -Wrestrict -Wnull-dereference