From 5f9b75b0c0e973e86f74834e82a3e0e8a4f23021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <kde@martin-graesslin.com>
Date: Sun, 12 Dec 2010 12:25:27 +0100
Subject: [PATCH] All KCMs build again

---
 kcmkwin/CMakeLists.txt                 | 7 ++-----
 kcmkwin/kwincompositing/CMakeLists.txt | 9 ++++++---
 kcmkwin/kwinscreenedges/CMakeLists.txt | 7 +++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/kcmkwin/CMakeLists.txt b/kcmkwin/CMakeLists.txt
index 30d264b874..86c2598ac8 100644
--- a/kcmkwin/CMakeLists.txt
+++ b/kcmkwin/CMakeLists.txt
@@ -3,10 +3,7 @@ kde4_no_enable_final( kwinoptions )
 add_subdirectory( kwinoptions )
 add_subdirectory( kwindecoration )
 add_subdirectory( kwinrules )
-if( NOT KWIN_BUILD_WITH_OPENGLES )
-    # depends on GL functionality not yet ported to ES
-    add_subdirectory( kwincompositing )
-    add_subdirectory( kwinscreenedges )
-endif( NOT KWIN_BUILD_WITH_OPENGLES )
+add_subdirectory( kwincompositing )
+add_subdirectory( kwinscreenedges )
 add_subdirectory( kwindesktop )
 add_subdirectory( kwintabbox )
diff --git a/kcmkwin/kwincompositing/CMakeLists.txt b/kcmkwin/kwincompositing/CMakeLists.txt
index bfa5102ffc..ce71832419 100644
--- a/kcmkwin/kwincompositing/CMakeLists.txt
+++ b/kcmkwin/kwincompositing/CMakeLists.txt
@@ -18,14 +18,17 @@ target_link_libraries(kcm_kwincompositing ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIB
 install(TARGETS kcm_kwincompositing  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 # CompositingPrefs uses OpenGL
-if(OPENGL_FOUND)
+if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
   target_link_libraries(kcm_kwincompositing ${OPENGL_gl_LIBRARY})
-# -ldl used by OpenGL code
+  # -ldl used by OpenGL code
   find_library(DL_LIBRARY dl)
   if (DL_LIBRARY)
     target_link_libraries(kcm_kwincompositing ${DL_LIBRARY})
   endif(DL_LIBRARY)
-endif(OPENGL_FOUND)
+endif(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
+if(KWIN_HAVE_OPENGLES_COMPOSITING)
+  target_link_libraries(kcm_kwincompositing ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES})
+endif(KWIN_HAVE_OPENGLES_COMPOSITING)
 if (X11_Xrender_FOUND)
   target_link_libraries(kcm_kwincompositing ${X11_Xrender_LIB})
 endif (X11_Xrender_FOUND)
diff --git a/kcmkwin/kwinscreenedges/CMakeLists.txt b/kcmkwin/kwinscreenedges/CMakeLists.txt
index 4c4e6d850a..132c938089 100644
--- a/kcmkwin/kwinscreenedges/CMakeLists.txt
+++ b/kcmkwin/kwinscreenedges/CMakeLists.txt
@@ -14,14 +14,17 @@ target_link_libraries( kcm_kwinscreenedges ${X11_LIBRARIES} kworkspace ${KDE4_PL
 install( TARGETS kcm_kwinscreenedges  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 # CompositingPrefs uses OpenGL
-if( OPENGL_FOUND )
+if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
   target_link_libraries( kcm_kwinscreenedges ${OPENGL_gl_LIBRARY} )
 # -ldl used by OpenGL code
   find_library( DL_LIBRARY dl )
   if( DL_LIBRARY )
     target_link_libraries( kcm_kwinscreenedges ${DL_LIBRARY} )
   endif( DL_LIBRARY )
-endif( OPENGL_FOUND )
+endif( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
+if(KWIN_HAVE_OPENGLES_COMPOSITING)
+  target_link_libraries(kcm_kwinscreenedges ${OPENGLES_LIBRARIES} ${OPENGLES_EGL_LIBRARIES})
+endif(KWIN_HAVE_OPENGLES_COMPOSITING)
 if( X11_Xrender_FOUND )
   target_link_libraries( kcm_kwinscreenedges ${X11_Xrender_LIB} )
 endif( X11_Xrender_FOUND )