From f702d4397305edebc121f87b9abfbe940c18380d Mon Sep 17 00:00:00 2001 From: Eugene Shalygin Date: Wed, 27 Apr 2016 14:33:23 +0200 Subject: [PATCH 1/2] cmake: mark libtorrent and qtsingleapplication include dirs as system --- cmake/Modules/FindLibtorrentRasterbar.cmake | 1 + cmake/Modules/FindQtSingleApplication.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/cmake/Modules/FindLibtorrentRasterbar.cmake b/cmake/Modules/FindLibtorrentRasterbar.cmake index 1f09f2d95..de96bd1ad 100644 --- a/cmake/Modules/FindLibtorrentRasterbar.cmake +++ b/cmake/Modules/FindLibtorrentRasterbar.cmake @@ -99,6 +99,7 @@ if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::LibTorrent) IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}" + INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}" INTERFACE_LINK_LIBRARIES "${LibtorrentRasterbar_LIBRARIES}" INTERFACE_COMPILE_OPTIONS "${LibtorrentRasterbar_DEFINITIONS}" ) diff --git a/cmake/Modules/FindQtSingleApplication.cmake b/cmake/Modules/FindQtSingleApplication.cmake index 1865afb5f..eb56607e9 100644 --- a/cmake/Modules/FindQtSingleApplication.cmake +++ b/cmake/Modules/FindQtSingleApplication.cmake @@ -84,6 +84,7 @@ if(NOT TARGET QtSingleApplication::QtSingleApplication) add_library(QtSingleApplication::QtSingleApplication UNKNOWN IMPORTED) set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}" + INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}" ) if(EXISTS "${QTSINGLEAPPLICATION_LIBRARY}") set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES From 565847ceb39ca93a6fc009664f7dc47108f4673f Mon Sep 17 00:00:00 2001 From: Eugene Shalygin Date: Sun, 1 May 2016 02:54:53 +0200 Subject: [PATCH 2/2] cmake: add Qt::DBus library dependency for base module This is needed for powermanagement and was mistakenly forgotten --- src/base/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index e3cc374a8..4fb66de83 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -123,6 +123,11 @@ else (QT4_FOUND) target_link_libraries(qbt_base Qt5::Gui Qt5::Widgets) endif (GUI) endif (QT4_FOUND) + +if (DBUS) + target_link_qt_components(qbt_base DBus) +endif () + if (APPLE) find_library(IOKit_LIBRARY IOKit) find_library(Carbon_LIBRARY Carbon)