From kde-commits Mon Sep 06 17:24:53 2010 From: =?utf-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Mon, 06 Sep 2010 17:24:53 +0000 To: kde-commits Subject: KDE/kdeartwork/kwin-styles Message-Id: <20100906172453.B9A82AC887 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128379364130363 SVN commit 1172196 by lunakl: build in kdeartwork M +3 -0 CMakeLists.txt M +1 -1 kde2/CMakeLists.txt M +1 -1 keramik/CMakeLists.txt M +1 -1 modernsystem/CMakeLists.txt M +1 -1 quartz/CMakeLists.txt M +2 -2 quartz/quartz.h M +1 -1 redmond/CMakeLists.txt M +1 -1 web/CMakeLists.txt M +2 -2 web/Web.h M +1 -1 web/WebButton.h --- trunk/KDE/kdeartwork/kwin-styles/CMakeLists.txt #1172195:1172196 @@ -1,3 +1,6 @@ +find_package( KDE4Workspace REQUIRED ) +include_directories( ${KDE4WORKSPACE_INCLUDE_DIR} ) + add_subdirectory( kde2 ) add_subdirectory( keramik ) add_subdirectory( modernsystem ) --- trunk/KDE/kdeartwork/kwin-styles/kde2/CMakeLists.txt #1172195:1172196 @@ -8,7 +8,7 @@ kde4_add_plugin(kwin3_kde2 ${kwin3_kde2_PART_SRCS}) -target_link_libraries(kwin3_kde2 kdecorations ${QT_QTGUI_LIBRARY}) +target_link_libraries(kwin3_kde2 ${KDE4WORKSPACE_KDECORATIONS_LIBS} ${QT_QTGUI_LIBRARY}) install(TARGETS kwin3_kde2 DESTINATION ${PLUGIN_INSTALL_DIR}) --- trunk/KDE/kdeartwork/kwin-styles/keramik/CMakeLists.txt #1172195:1172196 @@ -6,7 +6,7 @@ kde4_add_plugin(kwin3_keramik ${kwin3_keramik_PART_SRCS}) -target_link_libraries(kwin3_keramik ${KDE4_KDEUI_LIBS} kdecorations) +target_link_libraries(kwin3_keramik ${KDE4_KDEUI_LIBS} ${KDE4WORKSPACE_KDECORATIONS_LIBS}) install(TARGETS kwin3_keramik DESTINATION ${PLUGIN_INSTALL_DIR} ) --- trunk/KDE/kdeartwork/kwin-styles/modernsystem/CMakeLists.txt #1172195:1172196 @@ -7,7 +7,7 @@ kde4_add_plugin(kwin3_modernsys ${kwin3_modernsys_PART_SRCS}) -target_link_libraries(kwin3_modernsys kdecorations ${QT_QTGUI_LIBRARY}) +target_link_libraries(kwin3_modernsys ${KDE4WORKSPACE_KDECORATIONS_LIBS} ${QT_QTGUI_LIBRARY}) install(TARGETS kwin3_modernsys DESTINATION ${PLUGIN_INSTALL_DIR}) --- trunk/KDE/kdeartwork/kwin-styles/quartz/CMakeLists.txt #1172195:1172196 @@ -6,7 +6,7 @@ kde4_add_plugin(kwin3_quartz ${kwin3_quartz_PART_SRCS}) -target_link_libraries(kwin3_quartz kdecorations) +target_link_libraries(kwin3_quartz ${KDE4WORKSPACE_KDECORATIONS_LIBS}) install(TARGETS kwin3_quartz DESTINATION ${PLUGIN_INSTALL_DIR} ) --- trunk/KDE/kdeartwork/kwin-styles/quartz/quartz.h #1172195:1172196 @@ -29,8 +29,8 @@ #define __KDEGALLIUM_QUARTZ_H #include -#include "../../lib/kcommondecoration.h" -#include "../../lib/kdecorationfactory.h" +#include +#include namespace Quartz { --- trunk/KDE/kdeartwork/kwin-styles/redmond/CMakeLists.txt #1172195:1172196 @@ -2,7 +2,7 @@ kde4_add_plugin(kwin3_redmond ${kwin3_redmond_PART_SRCS}) -target_link_libraries(kwin3_redmond kdecorations) +target_link_libraries(kwin3_redmond ${KDE4WORKSPACE_KDECORATIONS_LIBS}) install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR}) --- trunk/KDE/kdeartwork/kwin-styles/web/CMakeLists.txt #1172195:1172196 @@ -11,7 +11,7 @@ -target_link_libraries(kwin3_web ${KDE4_KDEUI_LIBS} kdecorations ) +target_link_libraries(kwin3_web ${KDE4_KDEUI_LIBS} ${KDE4WORKSPACE_KDECORATIONS_LIBS} ) install(TARGETS kwin3_web DESTINATION ${PLUGIN_INSTALL_DIR} ) --- trunk/KDE/kdeartwork/kwin-styles/web/Web.h #1172195:1172196 @@ -23,8 +23,8 @@ #ifndef KWIN_WEB_H #define KWIN_WEB_H -#include "../../lib/kcommondecoration.h" -#include "../../lib/kdecorationfactory.h" +#include +#include namespace Web --- trunk/KDE/kdeartwork/kwin-styles/web/WebButton.h #1172195:1172196 @@ -26,7 +26,7 @@ #include #include -#include "../../lib/kcommondecoration.h" +#include namespace Web {