From 5d3cc2b31197f46fdca3af6496e5d348a8064be3 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 18 Mar 2006 11:25:38 +0000 Subject: [PATCH] Now it compiles fine svn path=/trunk/KDE/kdebase/workspace/; revision=519931 --- kcmkwin/CMakeLists.txt | 3 +-- kcmkwin/kwinrules/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/kcmkwin/CMakeLists.txt b/kcmkwin/CMakeLists.txt index 503fe61666..d62e9fdbd1 100644 --- a/kcmkwin/CMakeLists.txt +++ b/kcmkwin/CMakeLists.txt @@ -2,9 +2,8 @@ kde4_header() add_subdirectory( kwinoptions ) add_subdirectory( kwindecoration ) -#add_subdirectory( kwinrules ) +add_subdirectory( kwinrules ) -MESSAGE(STATUS "reactivate kwinrules") include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index e966627e9b..05a67270a0 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -2,7 +2,7 @@ kde4_header() include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/workspace/kwin/lib) - +ADD_DEFINITIONS(-DKCMRULES) ########### next target ############### set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp) @@ -14,7 +14,7 @@ kde4_automoc(${kwin_rules_dialog_KDEINIT_SRCS}) kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS}) -target_link_libraries(kdeinit_kwin_rules_dialog ${QT_AND_KDECORE_LIBS} ) +target_link_libraries(kdeinit_kwin_rules_dialog ${LIB_KDEUI} ) install_targets(${LIB_INSTALL_DIR} kdeinit_kwin_rules_dialog ) @@ -31,7 +31,7 @@ kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwinrules ) -target_link_libraries(kcm_kwinrules ${QT_AND_KDECORE_LIBS} ) +target_link_libraries(kcm_kwinrules ${LIB_KDEUI} ) install_targets(${LIB_INSTALL_DIR}/kde4 kcm_kwinrules )