* Rearrange CMakeLists.txt to be (IMHO) a bit more logical.

* Move drunken, shakymove and wavywindows from builtins to tests. Probably they should also be
  prefixed with test or demo, but I'm not bothered enough to do it myself yet.

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

effects/CMakeLists.txt

@@ -10,12 +10,15 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/workspace/kwin/lib
     )
 
+
+
+### builtins - most important, ready-to-use effects
+# sources
 SET(kwin4_effect_builtins_sources
     boxswitch.cpp
     desktopgrid.cpp
     dialogparent.cpp
     diminactive.cpp
-    drunken.cpp
     fade.cpp
     fallapart.cpp
     flame.cpp
@@ -23,20 +26,28 @@ SET(kwin4_effect_builtins_sources
     minimizeanimation.cpp
     presentwindows.cpp
     scalein.cpp
-    shakymove.cpp
     thumbnailaside.cpp
     zoom.cpp
     )
-
-SET(kwin4_effect_tests_sources
-    demo_shiftworkspaceup.cpp
-    demo_taskbarthumbnail.cpp
-    howto.cpp
-    test_input.cpp
-    test_thumbnail.cpp
-    )
+# their .desktop files
+install( FILES
+    boxswitch.desktop
+    desktopgrid.desktop
+    dialogparent.desktop
+    diminactive.desktop
+    fade.desktop
+    fallapart.desktop
+    flame.desktop
+    maketransparent.desktop
+    minimizeanimation.desktop
+    presentwindows.desktop
+    scalein.desktop
+    thumbnailaside.desktop
+    zoom.desktop
+    DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
 
 if(OPENGL_FOUND)
+    # opengl-based effects
     SET(kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
         blur.cpp
         explosioneffect.cpp
@@ -44,14 +55,7 @@ if(OPENGL_FOUND)
         mousemark.cpp
         shadow.cpp
         trackmouse.cpp
-        wavywindows.cpp
         )
-    SET(kwin4_effect_tests_sources ${kwin4_effect_tests_sources}
-        test_fbo.cpp
-        demo_liquid.cpp
-        demo_showpicture.cpp
-        )
-
     install( FILES
         blur.desktop
         explosion.desktop
@@ -59,20 +63,13 @@ if(OPENGL_FOUND)
         mousemark.desktop
         shadow.desktop
         trackmouse.desktop
-        wavywindows.desktop
-        test_fbo.desktop
-        demo_liquid.desktop
-        demo_showpicture.desktop
         DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
-
     install( FILES
         data/trackmouse.png
         data/explosion.frag
         data/explosion.vert
         data/explosion-start.png
         data/explosion-end.png
-        data/liquid.frag
-        data/liquid.vert
         data/blur.frag
         data/blur.vert
         data/blur-render.frag
@@ -80,9 +77,7 @@ if(OPENGL_FOUND)
         DESTINATION  ${DATA_INSTALL_DIR}/kwin )
 endif(OPENGL_FOUND)
 
-if (X11_Xrender_FOUND)
-endif (X11_Xrender_FOUND)
-
+# showfps - need both xrender and opengl
 if( OPENGL_FOUND AND X11_Xrender_FOUND )
     SET(kwin4_effect_builtins_sources ${kwin4_effect_builtins_sources}
         showfps.cpp
@@ -92,39 +87,64 @@ if( OPENGL_FOUND AND X11_Xrender_FOUND )
         DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
 endif( OPENGL_FOUND AND X11_Xrender_FOUND )
 
+# add the plugin
 KWIN4_ADD_EFFECT(builtins ${kwin4_effect_builtins_sources})
-if(OPENGL_FOUND)
-  target_link_libraries(kwin4_effect_builtins ${OPENGL_gl_LIBRARY})
-endif(OPENGL_FOUND)
+# link to xrender if necessary
+# note that libkwineffects already links to opengl, so no need to add this here
 if (X11_Xrender_FOUND)
   target_link_libraries(kwin4_effect_builtins ${X11_Xrender_LIB})
 endif (X11_Xrender_FOUND)
 
-KWIN4_ADD_EFFECT(tests ${kwin4_effect_tests_sources})
 
+
+### tests - meant to test/demo certain functionality, not really usable for end-users
+SET(kwin4_effect_tests_sources
+    demo_shiftworkspaceup.cpp
+    demo_taskbarthumbnail.cpp
+    drunken.cpp
+    howto.cpp
+    shakymove.cpp
+    test_input.cpp
+    test_thumbnail.cpp
+    )
 install( FILES
-    boxswitch.desktop
-    desktopgrid.desktop
-    dialogparent.desktop
-    diminactive.desktop
-    drunken.desktop
-    fade.desktop
-    fallapart.desktop
-    flame.desktop
-    howto.desktop
-    maketransparent.desktop
-    minimizeanimation.desktop
-    presentwindows.desktop
-    scalein.desktop
-    shakymove.desktop
-    thumbnailaside.desktop
-    zoom.desktop
     demo_shiftworkspaceup.desktop
     demo_taskbarthumbnail.desktop
+    drunken.desktop
+    howto.desktop
+    shakymove.desktop
     test_input.desktop
     test_thumbnail.desktop
     DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
 
+if(OPENGL_FOUND)
+    # opengl test/demo stuff
+    SET(kwin4_effect_tests_sources ${kwin4_effect_tests_sources}
+        demo_liquid.cpp
+        demo_showpicture.cpp
+        test_fbo.cpp
+        wavywindows.cpp
+        )
+
+    install( FILES
+        demo_liquid.desktop
+        demo_showpicture.desktop
+        test_fbo.desktop
+        wavywindows.desktop
+        DESTINATION ${DATA_INSTALL_DIR}/kwin/effects )
+
+    install( FILES
+        data/liquid.frag
+        data/liquid.vert
+        DESTINATION  ${DATA_INSTALL_DIR}/kwin )
+endif(OPENGL_FOUND)
+
+# add the plugin
+KWIN4_ADD_EFFECT(tests ${kwin4_effect_tests_sources})
+
+
+
+### videocapture plugin
 include(UsePkgConfig)
 PKGCONFIG(libcaptury CAPTURY_INCLUDES CAPTURY_LINK_DIR CAPTURY_LDFLAGS CAPTURY_CFLAGS)
 if( CAPTURY_LDFLAGS )

effects/drunken.desktop

@@ -3,4 +3,4 @@ Encoding=UTF-8
 Name=Drunken
 Name[el]=Κούνημα
 Name[nds]=Duun
-X-KDE-Library=kwin4_effect_builtins
+X-KDE-Library=kwin4_effect_tests

effects/shakymove.desktop

@@ -4,4 +4,4 @@ Name=ShakyMove
 Name[el]=Τρεμάμενη κίνηση
 Name[nds]=Bevern
 Name[zh_TW]=搖晃
-X-KDE-Library=kwin4_effect_builtins
+X-KDE-Library=kwin4_effect_tests

effects/wavywindows.desktop

@@ -5,4 +5,4 @@ Name[de]=Wellige Fenster
 Name[el]=Κυματιστά παράθυρα
 Name[nds]=Bülgenfinstern
 Name[zh_TW]=波浪狀視窗
-X-KDE-Library=kwin4_effect_builtins
+X-KDE-Library=kwin4_effect_tests