From 7fed0391ba2ccdbaa1cc8e12d4f076762f6aaa7f Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 18 Sep 2020 13:49:32 +0800 Subject: [PATCH 1/3] Don't impose unnecessary compile options on users This is unexpected for users that take single job compilation as the default (which is always the case since forever). Users can change the default if they wish to use multicore for compilation. --- cmake/Modules/MacroQbtCommonConfig.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmake/Modules/MacroQbtCommonConfig.cmake b/cmake/Modules/MacroQbtCommonConfig.cmake index f62396ed8..0e0068977 100644 --- a/cmake/Modules/MacroQbtCommonConfig.cmake +++ b/cmake/Modules/MacroQbtCommonConfig.cmake @@ -95,8 +95,4 @@ macro(qbt_common_config) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") endif() - if (CMAKE_GENERATOR MATCHES "Visual Studio") - target_compile_options(qbt_common_cfg INTERFACE /MP) - endif() - endmacro(qbt_common_config) From 6880e031455f4fc2943cbeba5bff3d0d0dfd0721 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 18 Sep 2020 13:54:57 +0800 Subject: [PATCH 2/3] Remove compile requirement for boost::system boost::system is not a dependency for our project. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e62b02e18..4a4a665b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,7 +32,7 @@ else() endif() # force variable type so that it always shows up in ccmake/cmake-gui frontends set_property(CACHE LibtorrentRasterbar_DIR PROPERTY TYPE PATH) -find_package(Boost ${requiredBoostVersion} REQUIRED COMPONENTS system) +find_package(Boost ${requiredBoostVersion} REQUIRED) find_package(OpenSSL ${requiredOpenSSLVersion} REQUIRED) find_package(ZLIB ${requiredZlibVersion} REQUIRED) find_package(Qt5 ${requiredQtVersion} REQUIRED COMPONENTS Core Network Xml LinguistTools) From 0539c816aea1a9368f80dfade37780aa22923f3a Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 18 Sep 2020 14:31:43 +0800 Subject: [PATCH 3/3] Set compression rate for rcc targets This follows our current setting in src.pro. --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a4a665b7..7f3d3ec98 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -45,6 +45,7 @@ if (DBUS) endif() # automatically call Qt moc, rcc and uic as needed for all targets by default +set(CMAKE_AUTORCC_OPTIONS --compress 9 --threshold 5) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON)