From 5d185a9adc7a9ab9a673c319e56bf02879ddd8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 27 Sep 2013 13:45:25 +0200 Subject: [PATCH] Welcome back to kcmkwin - so far only desktop Note to people compiling from source: it's only the default of the cmake variable which got changed. You have to delete the variable from the cache to get this change. --- CMakeLists.txt | 2 +- kcmkwin/CMakeLists.txt | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d3a438b80d..a66d434976 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE(CMakeDependentOption) OPTION(KWIN_BUILD_DECORATIONS "Enable building of KWin decorations." ON) OPTION(KWIN_BUILD_OXYGEN "Enable building of default decoration Oxygen" ON) -OPTION(KWIN_BUILD_KCMS "Enable building of KWin configuration modules." OFF) +OPTION(KWIN_BUILD_KCMS "Enable building of KWin configuration modules." ON) OPTION(KWIN_MOBILE_EFFECTS "Only build effects relevant for mobile devices" OFF) OPTION(KWIN_BUILD_TABBOX "Enable building of KWin Tabbox functionality" ON) OPTION(KWIN_BUILD_SCREENEDGES "Enable building of KWin with screen edge support" ON) diff --git a/kcmkwin/CMakeLists.txt b/kcmkwin/CMakeLists.txt index c4041a2b7b..5e20b9132d 100644 --- a/kcmkwin/CMakeLists.txt +++ b/kcmkwin/CMakeLists.txt @@ -1,15 +1,17 @@ -add_subdirectory( kwinoptions ) -add_subdirectory( kwindecoration ) -add_subdirectory( kwinrules ) -add_subdirectory( kwincompositing ) -if(KWIN_BUILD_SCREENEDGES) - add_subdirectory( kwinscreenedges ) -endif() -if(KWIN_BUILD_SCRIPTING) - add_subdirectory( kwinscripts ) -endif() +remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) + +# add_subdirectory( kwinoptions ) +# add_subdirectory( kwindecoration ) +# add_subdirectory( kwinrules ) +# add_subdirectory( kwincompositing ) +# if(KWIN_BUILD_SCREENEDGES) +# add_subdirectory( kwinscreenedges ) +# endif() +# if(KWIN_BUILD_SCRIPTING) +# add_subdirectory( kwinscripts ) +# endif() add_subdirectory( kwindesktop ) -if( KWIN_BUILD_TABBOX ) -add_subdirectory( kwintabbox ) -endif() +# if( KWIN_BUILD_TABBOX ) +# add_subdirectory( kwintabbox ) +# endif()