From 2a9e140a80dadd77f0075bebab88316d0d0b7ca3 Mon Sep 17 00:00:00 2001 From: mlaurent Date: Sun, 5 Aug 2007 07:19:06 +0000 Subject: [PATCH] Search plasma module Don't add so name to plasma plugins git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/extragear/utils/rsibreak@696528 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- CMakeLists.txt | 7 +++++-- plasma/CMakeLists.txt | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c87071b..61a47b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,11 +2,14 @@ project( rsibreak ) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) find_package (KDE4 REQUIRED) - include(KDE4Defaults) +macro_optional_find_package(Plasma) + add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) include_directories ( ${KDE4_INCLUDES} ) ADD_SUBDIRECTORY( icons ) ADD_SUBDIRECTORY( src ) -ADD_SUBDIRECTORY( plasma ) +if (PLASMA_FOUND) + ADD_SUBDIRECTORY( plasma ) +endif (PLASMA_FOUND) diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt index 714be5d..f46014c 100644 --- a/plasma/CMakeLists.txt +++ b/plasma/CMakeLists.txt @@ -4,8 +4,7 @@ set(rsibreak_SRCS rsibreak.cpp) kde4_add_plugin(plasma_applet_rsibreak ${rsibreak_SRCS}) -target_link_libraries(plasma_applet_rsibreak plasma ${KDE4_KIO_LIBS}) -set_target_properties(plasma_applet_rsibreak PROPERTIES VERSION 1.0.0 SOVERSION 1) +target_link_libraries(plasma_applet_rsibreak ${PLASMA_LIBS} ${KDE4_KIO_LIBS}) install(TARGETS plasma_applet_rsibreak DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES plasma-applet-rsibreak.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -- 2.11.4.GIT