Drop cmakedefine HAVE_WAYLAND_EGL

Now a required build dependency.
icc-effect-5.14.5
Martin Gräßlin 2015-08-11 12:20:52 +02:00
parent 3139dcd3b9
commit 06aacf4f65
5 changed files with 2 additions and 22 deletions

View File

@ -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_DIR}/libkwineffects/kwinconfig.h )
# for kwin internal things
set(HAVE_WAYLAND_EGL ${Wayland_Egl_FOUND})
set(HAVE_X11_XCB ${X11_XCB_FOUND})
include(CheckIncludeFiles)

View File

@ -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_backend.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 Wayland::Egl)
install(
TARGETS

View File

@ -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()

View File

@ -8,7 +8,6 @@
#define XCB_VERSION_STRING "${XCB_VERSION}"
#define KWIN_KILLER_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kwin_killer_helper"
#define KWIN_RULES_DIALOG_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kwin_rules_dialog"
#cmakedefine01 HAVE_WAYLAND_EGL
#cmakedefine01 HAVE_INPUT
#cmakedefine01 HAVE_X11_XCB
#cmakedefine01 HAVE_DRM

View File

@ -1346,12 +1346,6 @@ QString Workspace::supportInformation() const
support.append(yes);
#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