Merge pull request #6874 from evsh/no-old-style-cast

Disable warnings in the bundled QtSingleAppplication and fix CMake builds in Travis
This commit is contained in:
sledgehammer999 2017-06-01 15:10:18 +03:00 committed by GitHub
commit ace68d4961
2 changed files with 20 additions and 13 deletions

View file

@ -20,6 +20,10 @@ add_library(qtsingleapplication ${QBT_QTSINGLEAPPLICATION_HEADERS} ${QBT_QTSINGL
target_include_directories(qtsingleapplication INTERFACE "${qtsingleapplication_SOURCE_DIR}")
target_link_qt_components(qtsingleapplication Network)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
target_compile_options(qtsingleapplication PRIVATE "-w") # disable warning for 3rdparty code
endif()
if (GUI)
target_link_qt_components(qtsingleapplication Widgets)
endif (GUI)