From a675b9305b572607fea5f817a85819f7bd75f749 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 20 Sep 2020 17:00:50 +0800 Subject: [PATCH 1/2] Add compile flags from conf.pri.windows file to cmake --- cmake/Modules/MacroQbtCommonConfig.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmake/Modules/MacroQbtCommonConfig.cmake b/cmake/Modules/MacroQbtCommonConfig.cmake index 0e0068977..72e6f5702 100644 --- a/cmake/Modules/MacroQbtCommonConfig.cmake +++ b/cmake/Modules/MacroQbtCommonConfig.cmake @@ -95,4 +95,13 @@ macro(qbt_common_config) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") endif() + if (MSVC) + target_compile_options(qbt_common_cfg INTERFACE /guard:cf) + target_link_options(qbt_common_cfg INTERFACE /guard:cf + $<$>:/OPT:REF /OPT:ICF> + # suppress linking warning due to /INCREMENTAL and /OPT:ICF being both ON + $<$:/INCREMENTAL:NO> + ) + endif() + endmacro(qbt_common_config) From da2a26fa019e2bec537eb1fd773eeb0a0fb5bf33 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 20 Sep 2020 17:32:16 +0800 Subject: [PATCH 2/2] Use silent flag when invoking lrelease via cmake --- src/app/CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index df995e71f..977826a09 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -4,14 +4,22 @@ # Based on https://gist.github.com/giraldeau/546ba5512a74dfe9d8ea0862d66db412 file(GLOB QBT_TS_FILES "${qBittorrent_SOURCE_DIR}/src/lang/*.ts") set_source_files_properties(${QBT_TS_FILES} PROPERTIES OUTPUT_LOCATION "${qBittorrent_BINARY_DIR}/src/lang") -qt5_add_translation(QBT_QM_FILES ${QBT_TS_FILES}) +if (Qt5_VERSION VERSION_LESS 5.12) + qt5_add_translation(QBT_QM_FILES ${QBT_TS_FILES}) +else() + qt5_add_translation(QBT_QM_FILES ${QBT_TS_FILES} OPTIONS -silent) +endif() configure_file("${qBittorrent_SOURCE_DIR}/src/lang/lang.qrc" "${qBittorrent_BINARY_DIR}/src/lang/lang.qrc" COPYONLY) if (WEBUI) file(GLOB QBT_WEBUI_TS_FILES "${qBittorrent_SOURCE_DIR}/src/webui/www/translations/*.ts") set_source_files_properties(${QBT_WEBUI_TS_FILES} PROPERTIES OUTPUT_LOCATION "${qBittorrent_BINARY_DIR}/src/webui/www/translations") - qt5_add_translation(QBT_WEBUI_QM_FILES ${QBT_WEBUI_TS_FILES}) + if (Qt5_VERSION VERSION_LESS 5.12) + qt5_add_translation(QBT_WEBUI_QM_FILES ${QBT_WEBUI_TS_FILES}) + else() + qt5_add_translation(QBT_WEBUI_QM_FILES ${QBT_WEBUI_TS_FILES} OPTIONS -silent) + endif() configure_file("${qBittorrent_SOURCE_DIR}/src/webui/www/translations/webui_translations.qrc" "${qBittorrent_BINARY_DIR}/src/webui/www/translations/webui_translations.qrc" COPYONLY) endif()