Activate build of cube and cylinder

svn path=/trunk/KDE/kdebase/workspace/; revision=832916

effects/CMakeLists.txt

@@ -108,6 +108,8 @@ if(KWIN_HAVE_OPENGL_COMPOSITING)
     SET(kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
         blur.cpp
         coverswitch.cpp
+        cube.cpp
+        cylinder.cpp
         explosioneffect.cpp
         flipswitch.cpp
         invert.cpp
@@ -122,6 +124,8 @@ if(KWIN_HAVE_OPENGL_COMPOSITING)
     install( FILES
         blur.desktop
         coverswitch.desktop
+        cube.desktop
+        cylinder.desktop
         explosion.desktop
         flipswitch.desktop
         invert.desktop
@@ -153,10 +157,14 @@ if(KWIN_HAVE_OPENGL_COMPOSITING)
         data/snowflake.png
         data/circle.png
         data/circle-edgy.png
+        data/cylinder.frag
+        data/cylinder.vert
         DESTINATION  ${DATA_INSTALL_DIR}/kwin )
     SET(kwin4_effect_builtins_config_sources ${kwin4_effect_builtins_config_sources}
         coverswitch_config.cpp
         coverswitch_config.ui
+        cube_config.cpp
+        cube_config.ui
         flipswitch_config.cpp
         flipswitch_config.ui
         invert_config.cpp
@@ -175,6 +183,7 @@ if(KWIN_HAVE_OPENGL_COMPOSITING)
         )
     install( FILES
         coverswitch_config.desktop
+        cube_config.desktop
         flipswitch_config.desktop
         invert_config.desktop
         lookingglass_config.desktop

effects/configs_builtins.cpp

@@ -33,6 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef KWIN_HAVE_OPENGL_COMPOSITING
 #include "coverswitch_config.h"
+#include "cube_config.h"
 #include "flipswitch_config.h"
 #include "invert_config.h"
 #include "lookingglass_config.h"
@@ -69,6 +70,7 @@ KWIN_EFFECT_CONFIG_FACTORY
 
 #define OPENGL_PLUGINS \
     registerPlugin<KWin::CoverSwitchEffectConfig>("coverswitch"); \
+    registerPlugin<KWin::CubeEffectConfig>("cube"); \
     registerPlugin<KWin::FlipSwitchEffectConfig>("flipswitch"); \
     registerPlugin<KWin::InvertEffectConfig>("invert"); \
     registerPlugin<KWin::LookingGlassEffectConfig>("lookingglass"); \