From 7d636d8c3fbea9128ad84aeebddcbc757c94e1dc Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Fri, 2 Aug 2019 15:14:48 +0300 Subject: [PATCH 1/3] CMake: Accept _ROOT from environment --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5f0d33b3..6af87a745 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.9 FATAL_ERROR) message(AUTHOR_WARNING "If the build fails, please try the autotools/qmake method.") +if(POLICY CMP0074) + cmake_policy(SET CMP0074 NEW) +endif() + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules) include(FunctionReadVersion) From 3093751fa47e9ef0e585becf389a8774795232f5 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Fri, 2 Aug 2019 15:17:36 +0300 Subject: [PATCH 2/3] CMake: Fix compilation on Windows with MSVC --- cmake/Modules/winconf-msvc.cmake | 2 +- cmake/Modules/winconf.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/winconf-msvc.cmake b/cmake/Modules/winconf-msvc.cmake index 4a662d747..ef7b16f99 100644 --- a/cmake/Modules/winconf-msvc.cmake +++ b/cmake/Modules/winconf-msvc.cmake @@ -4,7 +4,7 @@ if (STACKTRACE) add_compile_options(-Oy-) endif (NOT "${WINXXBITS}" STREQUAL "Win64") add_compile_options(-Zi) - link_libraries(dbghelp.lib /DEBUG) + link_libraries(dbghelp -DEBUG) endif (STACKTRACE) include(MacroConfigureMSVCRuntime) diff --git a/cmake/Modules/winconf.cmake b/cmake/Modules/winconf.cmake index e0bfa96bd..c248742fe 100644 --- a/cmake/Modules/winconf.cmake +++ b/cmake/Modules/winconf.cmake @@ -30,6 +30,7 @@ add_definitions(-DUNICODE -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -DNOMINMAX + -DBOOST_ALL_NO_LIB ) # Enable if libtorrent was built with this flag defined From 6fe063146f959f9fefc84313707b98df87751bbe Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Fri, 2 Aug 2019 15:19:13 +0300 Subject: [PATCH 3/3] CMake: Apply QBT_ADDITONAL_FLAGS on all systems --- cmake/Modules/MacroQbtCompilerSettings.cmake | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/Modules/MacroQbtCompilerSettings.cmake b/cmake/Modules/MacroQbtCompilerSettings.cmake index 5f830c190..01488a6a8 100644 --- a/cmake/Modules/MacroQbtCompilerSettings.cmake +++ b/cmake/Modules/MacroQbtCompilerSettings.cmake @@ -73,30 +73,30 @@ macro(qbt_set_compiler_options) string(APPEND CMAKE_C_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}") string(APPEND CMAKE_CXX_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING} ${_GCC_COMMON_CXX_FLAGS_STRING}") - set(QBT_ADDITONAL_FLAGS "${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}" CACHE STRING - "Additional qBittorent compile flags" FORCE) - set(QBT_ADDITONAL_CXX_FLAGS "${_GCC_COMMON_CXX_FLAGS_STRING}" CACHE STRING - "Additional qBittorent C++ compile flags" FORCE) - # check whether we can enable -Og optimization for debug build # also let's enable -march=native for debug builds check_cxx_compiler_flag(-Og _DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED) if (_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED) - string(APPEND CMAKE_C_FLAGS_DEBUG " -Og -g3 -march=native -pipe" ) - string(APPEND CMAKE_CXX_FLAGS_DEBUG " -Og -g3 -march=native -pipe" ) + set(QBT_ADDITONAL_FLAGS "-Og -g3 -march=native -pipe" CACHE STRING + "Additional qBittorent compile flags") + set(QBT_ADDITONAL_CXX_FLAGS "-Og -g3 -march=native -pipe" CACHE STRING + "Additional qBittorent C++ compile flags") else(_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED) - string(APPEND CMAKE_C_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" ) - string(APPEND CMAKE_CXX_FLAGS_DEBUG " -O0 -g3 -march=native -pipe" ) + set(QBT_ADDITONAL_FLAGS "-O0 -g3 -march=native -pipe" CACHE STRING + "Additional qBittorent compile flags") + set(QBT_ADDITONAL_CXX_FLAGS "-O0 -g3 -march=native -pipe" CACHE STRING + "Additional qBittorent C++ compile flags") endif (_DEBUG_OPTIMIZATION_LEVEL_IS_SUPPORTED) endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") set(QBT_ADDITONAL_FLAGS "-wd4290 -wd4275 -wd4251 /W4" CACHE STRING "Additional qBittorent compile flags") - string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITONAL_FLAGS}") - string(APPEND CMAKE_CXX_FLAGS " ${QBT_ADDITONAL_FLAGS}") endif () + string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITONAL_FLAGS}") + string(APPEND CMAKE_CXX_FLAGS " ${QBT_ADDITONAL_FLAGS}") + # endif (NOT QBT_ADDITONAL_FLAGS) endmacro(qbt_set_compiler_options)