Browse Source

Merge pull request #13145 from jagannatharjun/cmake-speed

CMake improvements
adaptive-webui-19844
Mike Tzou 5 years ago committed by GitHub
parent
commit
8eecfb1bee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      cmake/Modules/MacroQbtCompilerSettings.cmake
  2. 2
      src/CMakeLists.txt

2
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") endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") 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 () endif ()
string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITIONAL_FLAGS}") string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITIONAL_FLAGS}")

2
src/CMakeLists.txt

@ -7,7 +7,7 @@ find_package(Boost ${requiredBoostVersion} REQUIRED)
find_package(LibtorrentRasterbar ${requiredLibtorrentVersion} REQUIRED) find_package(LibtorrentRasterbar ${requiredLibtorrentVersion} REQUIRED)
find_package(OpenSSL ${requiredOpensslVersion} 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) add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES)
endif() endif()

Loading…
Cancel
Save