From 473e9281062ac9d72bd0f467bfa654f32d7d11d2 Mon Sep 17 00:00:00 2001 From: Vasily Date: Mon, 18 Feb 2019 00:30:52 +0100 Subject: [PATCH] Refactor common switches into file --- .../qt/compilers/clang-gcc-common-switches.pri | 9 +++++++++ build_scripts/qt/compilers/clang-msvc.pri | 11 ++--------- build_scripts/qt/compilers/clang.pri | 16 +++++----------- build_scripts/qt/compilers/gcc.pri | 12 ++---------- 4 files changed, 18 insertions(+), 30 deletions(-) create mode 100644 build_scripts/qt/compilers/clang-gcc-common-switches.pri diff --git a/build_scripts/qt/compilers/clang-gcc-common-switches.pri b/build_scripts/qt/compilers/clang-gcc-common-switches.pri new file mode 100644 index 0000000..c7a339b --- /dev/null +++ b/build_scripts/qt/compilers/clang-gcc-common-switches.pri @@ -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 diff --git a/build_scripts/qt/compilers/clang-msvc.pri b/build_scripts/qt/compilers/clang-msvc.pri index 2ad4460..c549144 100644 --- a/build_scripts/qt/compilers/clang-msvc.pri +++ b/build_scripts/qt/compilers/clang-msvc.pri @@ -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 diff --git a/build_scripts/qt/compilers/clang.pri b/build_scripts/qt/compilers/clang.pri index b2af85e..ba39d33 100644 --- a/build_scripts/qt/compilers/clang.pri +++ b/build_scripts/qt/compilers/clang.pri @@ -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 diff --git a/build_scripts/qt/compilers/gcc.pri b/build_scripts/qt/compilers/gcc.pri index 4223ce6..df05be5 100644 --- a/build_scripts/qt/compilers/gcc.pri +++ b/build_scripts/qt/compilers/gcc.pri @@ -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