From aa4385230112f258bdfbfa976c758d8ebe536bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Fri, 30 Oct 2015 13:47:37 +0100
Subject: [PATCH] Remove build checks for gles or gl

Also removes the building of the kwinglesutils, there's only
kwinglutils now.

REVIEW: 125865
---
 CMakeLists.txt                | 31 +++++--------------------------
 effects/CMakeLists.txt        |  9 +--------
 libkwineffects/CMakeLists.txt | 21 +++++++--------------
 3 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4df17811f2..369f9c4e64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,22 +248,6 @@ set(KWIN_INTERNAL_NAME_X11 "kwin_x11")
 set(KWIN_INTERNAL_NAME_WAYLAND "kwin_wayland")
 set(KWIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
-set(KWIN_BUILD_OPENGL FALSE)
-set(KWIN_BUILD_OPENGLES FALSE)
-if(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GL")
-    set(KWIN_BUILD_OPENGL TRUE)
-    message("Building KWin with OpenGL support")
-endif()
-if(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GLESv2")
-    set(KWIN_BUILD_OPENGLES TRUE)
-    message("Building KWin with OpenGL ES 2 support")
-    add_definitions(-DKWIN_HAVE_OPENGLES)
-endif()
-
-if(NOT KWIN_BUILD_OPENGL AND NOT KWIN_BUILD_OPENGLES)
-    message(FATAL_ERROR "KWin needs to be built against either OpenGL or OpenGL ES 2. Check your Qt config!")
-endif()
-
 # KWIN_HAVE_XRENDER_COMPOSITING - whether XRender-based compositing support is available: may be disabled
 if( KWIN_BUILD_XRENDER_COMPOSITING )
     set( KWIN_HAVE_XRENDER_COMPOSITING 1 )
@@ -540,16 +524,11 @@ set_target_properties(kwin PROPERTIES
 target_link_libraries(kwin ${kwinLibs})
 generate_export_header(kwin EXPORT_FILE_NAME kwin_export.h)
 
-if(KWIN_BUILD_OPENGL)
-  target_link_libraries(kwin kwinglutils ${epoxy_LIBRARY})
-  # -ldl used by OpenGL code
-  find_library(DL_LIBRARY dl)
-  if (DL_LIBRARY)
-    target_link_libraries(kwin ${DL_LIBRARY})
-  endif()
-elseif(KWIN_BUILD_OPENGLES)
-  target_link_libraries(kwin ${kwinLibs} kwinglesutils ${epoxy_LIBRARY})
-  set_target_properties(kwin PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
+target_link_libraries(kwin kwinglutils ${epoxy_LIBRARY})
+# -ldl used by OpenGL code
+find_library(DL_LIBRARY dl)
+if (DL_LIBRARY)
+target_link_libraries(kwin ${DL_LIBRARY})
 endif()
 
 kf5_add_kdeinit_executable(kwin_x11 main_x11.cpp)
diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index a869d6e162..dec50a9291 100644
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -43,11 +43,7 @@ if( KWIN_HAVE_XRENDER_COMPOSITING )
     set(kwin_effect_XCB_LIBS ${kwin_effect_XCB_LIBS} XCB::RENDER)
 endif()
 
-if(KWIN_BUILD_OPENGL)
-    set(kwin_effect_OWN_LIBS ${kwin_effect_OWN_LIBS} kwinglutils)
-elseif(KWIN_BUILD_OPENGLES)
-    set(kwin_effect_OWN_LIBS ${kwin_effect_OWN_LIBS} kwinglesutils)
-endif()
+set(kwin_effect_OWN_LIBS ${kwin_effect_OWN_LIBS} kwinglutils)
 
 macro( KWIN4_ADD_EFFECT_BACKEND name )
     add_library( ${name} SHARED ${ARGN} )
@@ -57,9 +53,6 @@ endmacro()
 # Adds effect plugin with given name. Sources are given after the name
 macro( KWIN4_ADD_EFFECT name )
     kwin4_add_effect_backend(kwin4_effect_${name} ${ARGN})
-    if(KWIN_BUILD_OPENGLES)
-        set_target_properties(kwin4_effect_${name} PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGLES")
-    endif()
 
     set_target_properties(kwin4_effect_${name} PROPERTIES VERSION 1.0.0 SOVERSION 1 )
     set_target_properties(kwin4_effect_${name} PROPERTIES OUTPUT_NAME ${KWIN_NAME}4_effect_${name})
diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
index 800b9bdbf9..6e25f103eb 100644
--- a/libkwineffects/CMakeLists.txt
+++ b/libkwineffects/CMakeLists.txt
@@ -101,21 +101,14 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
     install(TARGETS ${name} EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 endmacro()
 
-if(KWIN_BUILD_OPENGLES)
-    kwin4_add_glutils_backend(kwinglesutils ${epoxy_INCLUDE_DIR} ${epoxy_LIBRARY})
-    set_target_properties(kwinglesutils PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGLES)
-    set_target_properties(kwinglesutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}glesutils)
-endif()
-if(KWIN_BUILD_OPENGL)
-    kwin4_add_glutils_backend(kwinglutils ${epoxy_INCLUDE_DIR} ${epoxy_LIBRARY})
-    set_target_properties(kwinglutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}glutils)
+kwin4_add_glutils_backend(kwinglutils ${epoxy_INCLUDE_DIR} ${epoxy_LIBRARY})
+set_target_properties(kwinglutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}glutils)
 
-    target_link_libraries(kwinglutils PUBLIC ${epoxy_LIBRARY})
-    # -ldl used by OpenGL code
-    find_library(DL_LIBRARY dl)
-    if (DL_LIBRARY)
-       target_link_libraries(kwinglutils PRIVATE ${DL_LIBRARY})
-    endif()
+target_link_libraries(kwinglutils PUBLIC ${epoxy_LIBRARY})
+# -ldl used by OpenGL code
+find_library(DL_LIBRARY dl)
+if (DL_LIBRARY)
+    target_link_libraries(kwinglutils PRIVATE ${DL_LIBRARY})
 endif()
 
 install( FILES