mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10944 from Chocobo1/cmake

Browse source 
Improve CMake build system
This commit is contained in:
Mike Tzou 2019-07-19 11:52:33 +08:00 committed by GitHub
commit 45eba9ec31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

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

6
cmake/Modules/MacroQbtCompilerSettings.cmake
View file

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

1
src/CMakeLists.txt
View file

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