diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -407,7 +407,6 @@ decorations/decorationrenderer.cpp decorations/decorations_logging.cpp abstract_egl_backend.cpp - eglonxbackend.cpp platform.cpp shell_client.cpp wayland_server.cpp diff --git a/plugins/platforms/x11/CMakeLists.txt b/plugins/platforms/x11/CMakeLists.txt --- a/plugins/platforms/x11/CMakeLists.txt +++ b/plugins/platforms/x11/CMakeLists.txt @@ -1,3 +1,4 @@ +add_subdirectory(common) add_subdirectory(standalone) if(X11_XCB_FOUND) add_subdirectory(windowed) diff --git a/plugins/platforms/x11/common/CMakeLists.txt b/plugins/platforms/x11/common/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/plugins/platforms/x11/common/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(eglx11common STATIC eglonxbackend.cpp) +target_link_libraries(eglx11common kwin) diff --git a/eglonxbackend.h b/plugins/platforms/x11/common/eglonxbackend.h rename from eglonxbackend.h rename to plugins/platforms/x11/common/eglonxbackend.h diff --git a/eglonxbackend.cpp b/plugins/platforms/x11/common/eglonxbackend.cpp rename from eglonxbackend.cpp rename to plugins/platforms/x11/common/eglonxbackend.cpp --- a/eglonxbackend.cpp +++ b/plugins/platforms/x11/common/eglonxbackend.cpp @@ -32,6 +32,8 @@ // system #include +Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtCriticalMsg) + namespace KWin { diff --git a/plugins/platforms/x11/standalone/CMakeLists.txt b/plugins/platforms/x11/standalone/CMakeLists.txt --- a/plugins/platforms/x11/standalone/CMakeLists.txt +++ b/plugins/platforms/x11/standalone/CMakeLists.txt @@ -9,7 +9,7 @@ endif() add_library(KWinX11Platform MODULE ${X11PLATFORM_SOURCES}) -target_link_libraries(KWinX11Platform kwin Qt5::X11Extras) +target_link_libraries(KWinX11Platform eglx11common kwin Qt5::X11Extras) install( TARGETS diff --git a/plugins/platforms/x11/windowed/CMakeLists.txt b/plugins/platforms/x11/windowed/CMakeLists.txt --- a/plugins/platforms/x11/windowed/CMakeLists.txt +++ b/plugins/platforms/x11/windowed/CMakeLists.txt @@ -6,7 +6,7 @@ ) add_library(KWinWaylandX11Backend MODULE ${X11BACKEND_SOURCES}) -target_link_libraries(KWinWaylandX11Backend kwin X11::XCB) +target_link_libraries(KWinWaylandX11Backend eglx11common kwin X11::XCB) install( TARGETS