Browse Source

Merge pull request #5205 from evsh/cmake

cmake: fix powermanagement compilation
adaptive-webui-19844
sledgehammer999 9 years ago
parent
commit
f6ff680295
  1. 1
      cmake/Modules/FindLibtorrentRasterbar.cmake
  2. 1
      cmake/Modules/FindQtSingleApplication.cmake
  3. 5
      src/base/CMakeLists.txt

1
cmake/Modules/FindLibtorrentRasterbar.cmake

@ -99,6 +99,7 @@ if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::LibTorrent) @@ -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}"
)

1
cmake/Modules/FindQtSingleApplication.cmake

@ -84,6 +84,7 @@ if(NOT TARGET QtSingleApplication::QtSingleApplication) @@ -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

5
src/base/CMakeLists.txt

@ -123,6 +123,11 @@ else (QT4_FOUND) @@ -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)

Loading…
Cancel
Save