Move the EglOnXBackend to the x11 platforms

Summary:
The EglOnXBackend is no longer needed in the core. It's only needed by
the two x11 platform plugins. To best share it, it's moved into a common
directory and compiled into a static library which in turn is linked by
the two plugins.

Reviewers: #plasma

Subscribers: plasma-devel

Projects: #plasma

Differential Revision: https://phabricator.kde.org/D1413
This commit is contained in:
Martin Gräßlin 2016-04-15 09:11:30 +02:00
parent 248991223b
commit 702b84b925
7 changed files with 7 additions and 3 deletions

View file

@ -407,7 +407,6 @@ set(kwin_KDEINIT_SRCS
decorations/decorationrenderer.cpp
decorations/decorations_logging.cpp
abstract_egl_backend.cpp
eglonxbackend.cpp
platform.cpp
shell_client.cpp
wayland_server.cpp

View file

@ -1,3 +1,4 @@
add_subdirectory(common)
add_subdirectory(standalone)
if(X11_XCB_FOUND)
add_subdirectory(windowed)

View file

@ -0,0 +1,2 @@
add_library(eglx11common STATIC eglonxbackend.cpp)
target_link_libraries(eglx11common kwin)

View file

@ -32,6 +32,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// system
#include <unistd.h>
Q_LOGGING_CATEGORY(KWIN_CORE, "kwin_core", QtCriticalMsg)
namespace KWin
{

View file

@ -9,7 +9,7 @@ if(HAVE_EPOXY_GLX)
endif()
add_library(KWinX11Platform MODULE ${X11PLATFORM_SOURCES})
target_link_libraries(KWinX11Platform kwin Qt5::X11Extras)
target_link_libraries(KWinX11Platform eglx11common kwin Qt5::X11Extras)
install(
TARGETS

View file

@ -6,7 +6,7 @@ set(X11BACKEND_SOURCES
)
add_library(KWinWaylandX11Backend MODULE ${X11BACKEND_SOURCES})
target_link_libraries(KWinWaylandX11Backend kwin X11::XCB)
target_link_libraries(KWinWaylandX11Backend eglx11common kwin X11::XCB)
install(
TARGETS