Browse Source

Merge pull request #10944 from Chocobo1/cmake

Improve CMake build system
adaptive-webui-19844
Mike Tzou 5 years ago committed by GitHub
parent
commit
45eba9ec31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .travis.yml
  2. 6
      cmake/Modules/MacroQbtCompilerSettings.cmake
  3. 1
      src/CMakeLists.txt

2
.travis.yml

@ -49,7 +49,7 @@ addons: @@ -49,7 +49,7 @@ addons:
name: "qbittorrent/qBittorrent"
description: "Build submitted via Travis CI"
build_command_prepend: "./bootstrap.sh && ./configure $qmake_conf"
build_command: make
build_command: "make -j2"
branch_pattern: $coverity_branch
notification_email: sledgehammer999@qbittorrent.org
apt:

6
cmake/Modules/MacroQbtCompilerSettings.cmake

@ -10,14 +10,14 @@ macro(qbt_set_compiler_options) @@ -10,14 +10,14 @@ macro(qbt_set_compiler_options)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
#-Wshadow -Wconversion ?
set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra"
"-Wfloat-equal -Wcast-qual -Wcast-align"
"-Wsign-conversion -Winvalid-pch -Wno-long-long"
"-Wcast-qual -Wcast-align"
"-Winvalid-pch -Wno-long-long"
#"-fstack-protector-all"
#"-Werror -Wno-error=deprecated-declarations"
)
set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti"
"-Woverloaded-virtual -Wold-style-cast"
"-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
"-Wnon-virtual-dtor"
#"-Weffc++"
#"-Werror -Wno-error=cpp"
# we should modify code to make these ones obsolete

1
src/CMakeLists.txt

@ -78,4 +78,3 @@ endif () @@ -78,4 +78,3 @@ endif ()
if (WEBUI)
add_subdirectory(webui)
endif (WEBUI)

Loading…
Cancel
Save