From c7da78ff1d7ab9b5b4c3143167376adea96aaae7 Mon Sep 17 00:00:00 2001 From: jagannatharjun Date: Thu, 16 Jul 2020 20:57:20 +0530 Subject: [PATCH 1/2] Fix invalid comparison for Boost version in CMake This reduces compile time more then half when compiled against Boost version greater than 1.60 --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a73d89e81..c00cf252d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(Boost ${requiredBoostVersion} REQUIRED) find_package(LibtorrentRasterbar ${requiredLibtorrentVersion} REQUIRED) find_package(OpenSSL ${requiredOpensslVersion} REQUIRED) -if (Boost_VERSION VERSION_LESS 106000) +if (Boost_VERSION_STRING VERSION_LESS 1.60.0) add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES) endif() From d355491b85999b7b9e75d1cbd85330972d525030 Mon Sep 17 00:00:00 2001 From: jagannatharjun Date: Fri, 17 Jul 2020 13:58:40 +0530 Subject: [PATCH 2/2] Use default warning level with MSVC in CMake Previously used warning level 4 creates a lot of noise that largely come from Qt headers --- cmake/Modules/MacroQbtCompilerSettings.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/MacroQbtCompilerSettings.cmake b/cmake/Modules/MacroQbtCompilerSettings.cmake index 15c70607f..6919e65bb 100644 --- a/cmake/Modules/MacroQbtCompilerSettings.cmake +++ b/cmake/Modules/MacroQbtCompilerSettings.cmake @@ -59,7 +59,7 @@ macro(qbt_set_compiler_options) endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - set(QBT_ADDITIONAL_FLAGS "/wd4251 /wd4275 /wd4290 /W4" CACHE STRING "Additional qBittorent compile flags") + set(QBT_ADDITIONAL_FLAGS "/wd4251 /wd4275 /wd4290" CACHE STRING "Additional qBittorent compile flags") endif () string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITIONAL_FLAGS}")