From d8ca2403a15181d0dbd9f7d05673bfa69ba2ec40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 3 Mar 2014 11:20:03 +0100 Subject: [PATCH] [kwin] Drop the KWIN_MOBILE_EFFECTS build option It's no longer needed as there won't be a KWin version specific to Plasma Active. We want to have runtime adjustments of all parts in the next version of Plasma. REVIEW: 116563 --- CMakeLists.txt | 2 - effects/CMakeLists.txt | 89 ++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 54 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 942385f2d8..1f50bb9ecc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,6 @@ 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." 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) option(KWIN_BUILD_SCRIPTING "Enable building of KWin with scripting support" ON) @@ -24,7 +23,6 @@ if(KWIN_PLASMA_ACTIVE) set(KWIN_BUILD_SCREENEDGES OFF) set(KWIN_BUILD_SCRIPTING ON) set(KWIN_BUILD_XRENDER_COMPOSITING OFF) - set(KWIN_MOBILE_EFFECTS ON) set(KWIN_BUILD_WITH_OPENGLES ON) set(KWIN_NAME "kwinactive") endif() diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 4654eec7ba..e74a579a5e 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -100,81 +100,66 @@ install( FILES kwineffect.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) # Create initial variables set( kwin4_effect_builtins_sources logging.cpp effect_builtins.cpp) -if( NOT KWIN_MOBILE_EFFECTS ) - set( kwin4_effect_builtins_config_sources configs_builtins.cpp ) -endif() +set( kwin4_effect_builtins_config_sources configs_builtins.cpp ) set( kwin4_effect_include_directories ) # scripted effects add_subdirectory( dialogparent ) add_subdirectory( fade ) +add_subdirectory( fadedesktop ) add_subdirectory( login ) - -# scripted effects only relevant to desktop -if( NOT KWIN_MOBILE_EFFECTS ) - add_subdirectory( fadedesktop ) - add_subdirectory( maximize ) - add_subdirectory( scalein ) - add_subdirectory( translucency ) -endif() +add_subdirectory( maximize ) +add_subdirectory( scalein ) +add_subdirectory( translucency ) ############################################################################### # Built-in effects go here # Common effects +include( dashboard/CMakeLists.txt ) +include( desktopgrid/CMakeLists.txt ) +include( diminactive/CMakeLists.txt ) +include( dimscreen/CMakeLists.txt ) +include( fallapart/CMakeLists.txt ) +include( highlightwindow/CMakeLists.txt ) include( kscreen/CMakeLists.txt ) +include( magiclamp/CMakeLists.txt ) +include( minimizeanimation/CMakeLists.txt ) include( presentwindows/CMakeLists.txt ) +include( resize/CMakeLists.txt ) include( screenedge/CMakeLists.txt ) +include( showfps/CMakeLists.txt ) +include( showpaint/CMakeLists.txt ) +include( slide/CMakeLists.txt ) +include( slideback/CMakeLists.txt ) include( slidingpopups/CMakeLists.txt ) include( taskbarthumbnail/CMakeLists.txt ) - -# Common effects only relevant to desktop -if( NOT KWIN_MOBILE_EFFECTS ) - include( dashboard/CMakeLists.txt ) - include( desktopgrid/CMakeLists.txt ) - include( diminactive/CMakeLists.txt ) - include( dimscreen/CMakeLists.txt ) - include( fallapart/CMakeLists.txt ) - include( highlightwindow/CMakeLists.txt ) - include( magiclamp/CMakeLists.txt ) - include( minimizeanimation/CMakeLists.txt ) - include( resize/CMakeLists.txt ) - include( showfps/CMakeLists.txt ) - include( showpaint/CMakeLists.txt ) - include( slide/CMakeLists.txt ) - include( slideback/CMakeLists.txt ) - include( thumbnailaside/CMakeLists.txt ) - include( windowgeometry/CMakeLists.txt ) - include( zoom/CMakeLists.txt ) - include( logout/CMakeLists.txt ) -endif() +include( thumbnailaside/CMakeLists.txt ) +include( windowgeometry/CMakeLists.txt ) +include( zoom/CMakeLists.txt ) +include( logout/CMakeLists.txt ) # OpenGL-specific effects include( blur/CMakeLists.txt ) include( backgroundcontrast/CMakeLists.txt ) +include( coverswitch/CMakeLists.txt ) +include( cube/CMakeLists.txt ) +include( flipswitch/CMakeLists.txt ) +include( glide/CMakeLists.txt ) +include( invert/CMakeLists.txt ) +include( lookingglass/CMakeLists.txt ) +include( magnifier/CMakeLists.txt ) +include( mouseclick/CMakeLists.txt ) +include( mousemark/CMakeLists.txt ) include( screenshot/CMakeLists.txt ) -# OpenGL-specific effects for desktop -if( NOT KWIN_MOBILE_EFFECTS ) - include( coverswitch/CMakeLists.txt ) - include( cube/CMakeLists.txt ) - include( flipswitch/CMakeLists.txt ) - include( glide/CMakeLists.txt ) - include( invert/CMakeLists.txt ) - include( lookingglass/CMakeLists.txt ) - include( magnifier/CMakeLists.txt ) - include( mouseclick/CMakeLists.txt ) - include( mousemark/CMakeLists.txt ) - include( sheet/CMakeLists.txt ) - include( snaphelper/CMakeLists.txt ) - include( startupfeedback/CMakeLists.txt ) - include( trackmouse/CMakeLists.txt ) - include( wobblywindows/CMakeLists.txt ) -endif() +include( sheet/CMakeLists.txt ) +include( snaphelper/CMakeLists.txt ) +include( startupfeedback/CMakeLists.txt ) +include( trackmouse/CMakeLists.txt ) +include( wobblywindows/CMakeLists.txt ) ############################################################################### # Add the builtins plugin kwin4_add_effect( builtins ${kwin4_effect_builtins_sources} ) -if( NOT KWIN_MOBILE_EFFECTS ) - kwin4_add_effect_config( builtins ${kwin4_effect_builtins_config_sources} ) -endif() +kwin4_add_effect_config( builtins ${kwin4_effect_builtins_config_sources} )