From b17edd2d051296a11118343c02826c2a743f896a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Sat, 13 Aug 2011 16:38:57 +0200
Subject: [PATCH] Cleanup libkwineffects/CmakeLists.txt

* we always have OpenGL(ES) - no need to check for it
* we always have the X extensions used by kwineffects
---
 libkwineffects/CMakeLists.txt | 88 +++++++++++++++--------------------
 1 file changed, 37 insertions(+), 51 deletions(-)

diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
index e9e73150ed..6506ee0004 100644
--- a/libkwineffects/CMakeLists.txt
+++ b/libkwineffects/CMakeLists.txt
@@ -9,65 +9,51 @@ set(kwin_EFFECTSLIB_SRCS
 
 kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
 target_link_libraries(kwineffects ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}
-    ${X11_LIBRARIES} kephal)
+    ${X11_LIBRARIES} kephal
+    ${X11_Xrender_LIB}
+    ${X11_Xrandr_LIB}
+    ${X11_Xcomposite_LIB}
+    ${X11_Xdamage_LIB}
+    ${X11_Xfixes_LIB}
+)
 set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 
 install(TARGETS kwineffects EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-if(OPENGL_FOUND OR OPENGLES_FOUND)
+# kwingl(es)utils library
+set(kwin_GLUTILSLIB_SRCS
+    kwinglutils.cpp
+    kwingltexture.cpp
+    kwinglutils_funcs.cpp
+    kwinglplatform.cpp
+    )
 
-    set(kwin_GLUTILSLIB_SRCS
-        kwinglutils.cpp
-        kwingltexture.cpp
-        kwinglutils_funcs.cpp
-        kwinglplatform.cpp
-        )
+macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
+    include_directories(${glinclude})
+    kde4_add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
+    target_link_libraries(${name} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES} kephal kwineffects)
+    set_target_properties(${name} PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+    target_link_libraries(${name} ${ARGN})
+    target_link_libraries(${name} LINK_INTERFACE_LIBRARIES ${ARGN})
 
-    macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
-        include_directories(${glinclude})
-        kde4_add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
-        target_link_libraries(${name} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES} kephal kwineffects)
-        set_target_properties(${name} PROPERTIES VERSION 1.0.0 SOVERSION 1 )
-        target_link_libraries(${name} ${ARGN})
-        target_link_libraries(${name} LINK_INTERFACE_LIBRARIES ${ARGN})
+    install(TARGETS ${name} EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+endmacro( KWIN4_ADD_GLUTILS_BACKEND )
 
-        install(TARGETS ${name} EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
-    endmacro( KWIN4_ADD_GLUTILS_BACKEND )
-
-    if(OPENGLES_FOUND)
-        KWIN4_ADD_GLUTILS_BACKEND(kwinglesutils ${OPENGLES_INCLUDE_DIR} ${OPENGLES_LIBRARIES})
-        set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGLES)
-    endif(OPENGLES_FOUND)
-    if(OPENGL_FOUND)
-        KWIN4_ADD_GLUTILS_BACKEND(kwinglutils ${OPENGL_INCLUDE_DIR} ${OPENGL_gl_LIBRARY})
-
-        target_link_libraries(kwinglutils ${OPENGL_gl_LIBRARY})
-        target_link_libraries(kwinglutils LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY})
-        # -ldl used by OpenGL code
-        find_library(DL_LIBRARY dl)
-        if (DL_LIBRARY)
-            target_link_libraries(kwinglutils ${DL_LIBRARY})
-        endif(DL_LIBRARY)
-    endif(OPENGL_FOUND)
-
-endif(OPENGL_FOUND OR OPENGLES_FOUND)
-
-if (X11_Xrender_FOUND)
-  target_link_libraries(kwineffects ${X11_Xrender_LIB})
-endif (X11_Xrender_FOUND)
-if (X11_Xrandr_FOUND)
-  target_link_libraries(kwineffects ${X11_Xrandr_LIB})
-endif (X11_Xrandr_FOUND)
-if (X11_Xcomposite_FOUND)
-  target_link_libraries(kwineffects ${X11_Xcomposite_LIB})
-endif (X11_Xcomposite_FOUND)
-if (X11_Xdamage_FOUND)
-  target_link_libraries(kwineffects ${X11_Xdamage_LIB})
-endif (X11_Xdamage_FOUND)
-if (X11_Xfixes_FOUND)
-  target_link_libraries(kwineffects ${X11_Xfixes_LIB})
-endif (X11_Xfixes_FOUND)
+if(OPENGLES_FOUND)
+    KWIN4_ADD_GLUTILS_BACKEND(kwinglesutils ${OPENGLES_INCLUDE_DIR} ${OPENGLES_LIBRARIES})
+    set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGLES)
+endif(OPENGLES_FOUND)
+if(OPENGL_FOUND)
+    KWIN4_ADD_GLUTILS_BACKEND(kwinglutils ${OPENGL_INCLUDE_DIR} ${OPENGL_gl_LIBRARY})
 
+    target_link_libraries(kwinglutils ${OPENGL_gl_LIBRARY})
+    target_link_libraries(kwinglutils LINK_INTERFACE_LIBRARIES ${OPENGL_gl_LIBRARY})
+    # -ldl used by OpenGL code
+    find_library(DL_LIBRARY dl)
+    if (DL_LIBRARY)
+        target_link_libraries(kwinglutils ${DL_LIBRARY})
+    endif(DL_LIBRARY)
+endif(OPENGL_FOUND)
 
 install( FILES
     kwinglobals.h