[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin] /: Drop cmakedefine HAVE_WAYLAND_EGL
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2015-08-12 9:39:42
Message-ID: E1ZPSVa-0005Uk-GL () scm ! kde ! org
[Download RAW message or body]

Git commit 06aacf4f65fe06b074dc2444f857dbcb02ad207f by Martin Gr=C3=A4=C3=
=9Flin.
Committed on 12/08/2015 at 09:39.
Pushed by graesslin into branch 'master'.

Drop cmakedefine HAVE_WAYLAND_EGL

Now a required build dependency.

M  +0    -1    CMakeLists.txt
M  +2    -8    backends/wayland/CMakeLists.txt
M  +0    -6    backends/wayland/wayland_backend.cpp
M  +0    -1    config-kwin.h.cmake
M  +0    -6    workspace.cpp

http://commits.kde.org/kwin/06aacf4f65fe06b074dc2444f857dbcb02ad207f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23c00eb..c1b9c6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,7 +261,6 @@ include_directories(${epoxy_INCLUDE_DIR})
 # for things that are also used by kwin libraries
 configure_file(libkwineffects/kwinconfig.h.cmake ${CMAKE_CURRENT_BINARY_DI=
R}/libkwineffects/kwinconfig.h )
 # for kwin internal things
-set(HAVE_WAYLAND_EGL ${Wayland_Egl_FOUND})
 set(HAVE_X11_XCB ${X11_XCB_FOUND})
 =

 include(CheckIncludeFiles)
diff --git a/backends/wayland/CMakeLists.txt b/backends/wayland/CMakeLists.=
txt
index 7f643df..0f844b0 100644
--- a/backends/wayland/CMakeLists.txt
+++ b/backends/wayland/CMakeLists.txt
@@ -3,17 +3,11 @@ set(WAYLAND_BACKEND_SOURCES
     scene_qpainter_wayland_backend.cpp
     screens_wayland.cpp
     wayland_backend.cpp
+    egl_wayland_backend.cpp
 )
-if(Wayland_Egl_FOUND)
-    set(WAYLAND_BACKEND_SOURCES ${WAYLAND_BACKEND_SOURCES} egl_wayland_bac=
kend.cpp)
-endif()
 =

 add_library(KWinWaylandWaylandBackend MODULE ${WAYLAND_BACKEND_SOURCES})
-target_link_libraries(KWinWaylandWaylandBackend kwin KF5::WaylandClient)
-
-if(Wayland_Egl_FOUND)
-    target_link_libraries(KWinWaylandWaylandBackend Wayland::Egl)
-endif()
+target_link_libraries(KWinWaylandWaylandBackend kwin KF5::WaylandClient Wa=
yland::Egl)
 =

 install(
     TARGETS
diff --git a/backends/wayland/wayland_backend.cpp b/backends/wayland/waylan=
d_backend.cpp
index a708be4..d7c6ea2 100644
--- a/backends/wayland/wayland_backend.cpp
+++ b/backends/wayland/wayland_backend.cpp
@@ -27,9 +27,7 @@ along with this program.  If not, see <http://www.gnu.org=
/licenses/>.
 #include "screens_wayland.h"
 #include "wayland_server.h"
 #include "wayland_cursor_theme.h"
-#if HAVE_WAYLAND_EGL
 #include "egl_wayland_backend.h"
-#endif
 #include <KWayland/Client/buffer.h>
 #include <KWayland/Client/compositor.h>
 #include <KWayland/Client/connection_thread.h>
@@ -585,11 +583,7 @@ Screens *WaylandBackend::createScreens(QObject *parent)
 =

 OpenGLBackend *WaylandBackend::createOpenGLBackend()
 {
-#if HAVE_WAYLAND_EGL
     return new EglWaylandBackend(this);
-#else
-    return nullptr;
-#endif
 }
 =

 QPainterBackend *WaylandBackend::createQPainterBackend()
diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake
index 0633131..e1ff011 100644
--- a/config-kwin.h.cmake
+++ b/config-kwin.h.cmake
@@ -8,7 +8,6 @@
 #define XCB_VERSION_STRING "${XCB_VERSION}"
 #define KWIN_KILLER_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kw=
in_killer_helper"
 #define KWIN_RULES_DIALOG_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_D=
IR}/kwin_rules_dialog"
-#cmakedefine01 HAVE_WAYLAND_EGL
 #cmakedefine01 HAVE_INPUT
 #cmakedefine01 HAVE_X11_XCB
 #cmakedefine01 HAVE_DRM
diff --git a/workspace.cpp b/workspace.cpp
index f9100ab..43ec3df 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1347,12 +1347,6 @@ QString Workspace::supportInformation() const
 #else
     support.append(no);
 #endif
-    support.append(QStringLiteral("HAVE_WAYLAND_EGL: "));
-#if HAVE_WAYLAND_EGL
-    support.append(yes);
-#else
-    support.append(no);
-#endif
     support.append(QStringLiteral("HAVE_INPUT: "));
 #if HAVE_INPUT
     support.append(yes);

[prev in list] [next in list] [prev in thread] [next in thread]