diff options
Diffstat (limited to 'kdesktop/CMakeLists.txt')
| -rw-r--r-- | kdesktop/CMakeLists.txt | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt index bace17152..906eee4cc 100644 --- a/kdesktop/CMakeLists.txt +++ b/kdesktop/CMakeLists.txt @@ -17,6 +17,7 @@ add_subdirectory( patterns ) add_subdirectory( programs ) add_subdirectory( init ) add_subdirectory( kwebdesktop ) +add_subdirectory( dbus/interfaces ) add_subdirectory( dbus/screensaver ) @@ -34,21 +35,22 @@ include_directories( ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ${DBUS_INCLUDE_DIRS} - ${DBUS_1_TQT_INCLUDE_DIRS} + ${DBUS_TQT_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} ${LIBART_LIBRARY_DIRS} - ${DBUS_1_TQT_LIBRARY_DIRS} + ${DBUS_TQT_LIBRARY_DIRS} ) ##### headers ################################### -install( FILES - KDesktopIface.h KScreensaverIface.h KBackgroundIface.h - DESTINATION ${INCLUDE_INSTALL_DIR} ) +install( + FILES KDesktopIface.h KScreensaverIface.h KBackgroundIface.h + DESTINATION ${INCLUDE_INSTALL_DIR} +) ##### other data ################################ @@ -91,19 +93,21 @@ set( ${target}_SRCS pixmapserver.cpp kcustommenu.cpp startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c kshadowengine.cpp kshadowsettings.cpp kdesktopshadowsettings.cpp - tdefileividesktop.cpp kdesktopapp.cpp dbusscreensaverservice.cpp + tdefileividesktop.cpp kdesktopapp.cpp ) tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} LINK - pthread kdesktopsettings-static bgnd-static dmctl-static - screensaverinterfaces-static + pthread kdesktopsettings-static bgnd-static dmctl-static + dbusscreensaverservice-static dbusscreensaveriface-static konq-shared tdeutils-shared tdesu-shared ${TDEHW_LIBRARIES} - ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${DL_LIBRARIES} - ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} + ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${CMAKE_DL_LIBS} + ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ) +add_dependencies(${target} dbusscreensaveriface-static dbusscreensaverservice-static ) + ##### kdesktopsettings (static) ################# |