fix linux build

This commit is contained in:
Patrick von Reth 2015-02-01 18:35:19 +01:00
parent f1e78e31ed
commit 8be2a991a0
4 changed files with 7 additions and 9 deletions

View File

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -1,5 +1,5 @@
<RCC> <RCC>
<qresource prefix="/root"> <qresource prefix="/root">
<file alias="snore.png">128-snore.png</file> <file alias="snore.png">128-apps-snore.png</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@ -1,6 +1,7 @@
if(WITH_SNORE_DAEMON) if(WITH_SNORE_DAEMON)
include(ECMAddAppIcon) include(ECMAddAppIcon)
ecm_add_app_icon(SNORENOTIFY_DEAMON_DEPS ICONS ${PROJECT_SOURCE_DIR}/data/128-snore.png) include(ECMInstallIcons)
ecm_add_app_icon(SNORENOTIFY_DEAMON_DEPS ICONS ${PROJECT_SOURCE_DIR}/data/128-apps-snore.png)
add_executable( snorenotify WIN32 main.cpp snorenotify.cpp trayicon.cpp ${SNORENOTIFY_DEAMON_DEPS}) add_executable( snorenotify WIN32 main.cpp snorenotify.cpp trayicon.cpp ${SNORENOTIFY_DEAMON_DEPS})
target_link_libraries( snorenotify libsnore Qt5::Gui Qt5::Widgets ) target_link_libraries( snorenotify libsnore Qt5::Gui Qt5::Widgets )
@ -9,9 +10,9 @@ if(WITH_SNORE_DAEMON)
ARCHIVE DESTINATION lib) ARCHIVE DESTINATION lib)
if(UNIX) if(UNIX)
install(FILES ${PROJECT_SOURCE_DIR }/data/128-snore.png DESTINATION ${KDE_ICONDIR}/snore.png) ecm_install_icons(ICONS ${PROJECT_SOURCE_DIR}/data/128-apps-snore.png DESTINATION ${KDE_INSTALL_ICONDIR})
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/snorenotify.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/snorenotify.desktop" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/snorenotify.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/snorenotify.desktop" @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/snorenotify.desktop" DESTINATION ${KDE_APPDIR}) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/snorenotify.desktop" DESTINATION ${KDE_INSTALL_APPDIR})
endif() endif()
endif() endif()

View File

@ -3,10 +3,7 @@ if(NOT WITH_FREEDESKTOP_FRONTEND AND UNIX AND NOT APPLE)
set_package_properties(Qt5DBus PROPERTIES set_package_properties(Qt5DBus PROPERTIES
PURPOSE "Support for Freedesktop Notifications" PURPOSE "Support for Freedesktop Notifications"
TYPE OPTIONAL) TYPE OPTIONAL)
set(QT_QTDBUS_FOUND TRUE) if(Qt5DBus_FOUND)
set(QT_QTDBUS_LIBRARY Qt5::DBus)
if(QT_QTDBUS_FOUND)
message(STATUS "Adding Freedesktop notification backend") message(STATUS "Adding Freedesktop notification backend")
set ( FREEDESKTOP_NOTIFICATION_SRC set ( FREEDESKTOP_NOTIFICATION_SRC
@ -18,7 +15,7 @@ if(NOT WITH_FREEDESKTOP_FRONTEND AND UNIX AND NOT APPLE)
add_library(libsnore_backend_freedesktop MODULE ${FREEDESKTOP_NOTIFICATION_SRC} ) add_library(libsnore_backend_freedesktop MODULE ${FREEDESKTOP_NOTIFICATION_SRC} )
target_link_libraries(libsnore_backend_freedesktop Snore::Libsnore Qt5::DBus ) target_link_libraries(libsnore_backend_freedesktop Snore::Libsnore Qt5::DBus )
install(TARGETS libsnore_backend_freedesktop ${SNORE_PLUGIN_INSTALL_PATH}) install(TARGETS libsnore_backend_freedesktop ${SNORE_PLUGIN_INSTALL_PATH})
endif() endif()