From 4153a2e2affdbbc9ee8bc97b39b42fa0ffb55280 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 18 Jul 2019 14:26:12 +0800 Subject: [PATCH 1/2] Use 2 cpus when compiling on coverity_scan branch --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d7bd38a3e..02c6cf456 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ addons: name: "qbittorrent/qBittorrent" description: "Build submitted via Travis CI" build_command_prepend: "./bootstrap.sh && ./configure $qmake_conf" - build_command: make + build_command: "make -j2" branch_pattern: $coverity_branch notification_email: sledgehammer999@qbittorrent.org apt: From 752d4b85eacbb0def6784a4904cb687816f3b599 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 18 Jul 2019 14:34:39 +0800 Subject: [PATCH 2/2] Remove compiler warning flags Apperently nobody care about those warnings so just remove them and let other more important warnings stand out. --- cmake/Modules/MacroQbtCompilerSettings.cmake | 6 +++--- src/CMakeLists.txt | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/MacroQbtCompilerSettings.cmake b/cmake/Modules/MacroQbtCompilerSettings.cmake index 6468e7db3..8c3ae7b44 100644 --- a/cmake/Modules/MacroQbtCompilerSettings.cmake +++ b/cmake/Modules/MacroQbtCompilerSettings.cmake @@ -10,14 +10,14 @@ macro(qbt_set_compiler_options) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") #-Wshadow -Wconversion ? set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra" - "-Wfloat-equal -Wcast-qual -Wcast-align" - "-Wsign-conversion -Winvalid-pch -Wno-long-long" + "-Wcast-qual -Wcast-align" + "-Winvalid-pch -Wno-long-long" #"-fstack-protector-all" #"-Werror -Wno-error=deprecated-declarations" ) set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti" "-Woverloaded-virtual -Wold-style-cast" - "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align" + "-Wnon-virtual-dtor" #"-Weffc++" #"-Werror -Wno-error=cpp" # we should modify code to make these ones obsolete diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 835a556cd..74d963021 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -78,4 +78,3 @@ endif () if (WEBUI) add_subdirectory(webui) endif (WEBUI) -