From 7eb18d9fd540c7a87ef85d4d01b5681d3088fd43 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 25 Jul 2011 19:07:54 +0200 Subject: [PATCH 1/2] turn the plasma active build on in kwin by default if building for non-desktop profiles --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4859978778..d28ca9011c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,11 @@ OPTION(KWIN_BUILD_DESKTOPCHANGEOSD "Enable building of KWin DesktopChangeOSD fun OPTION(KWIN_BUILD_SCREENEDGES "Enable building of KWin with screen edge support" ON) OPTION(KWIN_BUILD_SCRIPTING "Enable building of KWin with scripting support" ON) OPTION(KWIN_BUILD_XRENDER_COMPOSITING "Enable building of KWin with XRender Compositing support" ON) -OPTION(KWIN_PLASMA_ACTIVE "Enable building KWin for Plasma Active." OFF) +if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop") + OPTION(KWIN_PLASMA_ACTIVE "Enable building KWin for Plasma Active." OFF) +else(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop") + OPTION(KWIN_PLASMA_ACTIVE "Enable building KWin for Plasma Active." On) +endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop") if(KWIN_PLASMA_ACTIVE) set(KWIN_BUILD_DECORATIONS OFF) From 7951d66ae49e459d6a97f3fd9a0f38eaae612704 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 26 Jul 2011 07:50:58 +0200 Subject: [PATCH 2/2] Fix the includes (due to removal of libs/kworkspace as includedir) --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 9b87b61750..762446386f 100644 --- a/main.cpp +++ b/main.cpp @@ -54,7 +54,7 @@ along with this program. If not, see . #include #include #include -#include +#include #include