platformsupport: Set PUBLIC include directories

This makes using platform support libs easier.

autotests/integration/CMakeLists.txt

@@ -116,7 +116,7 @@ if (XCB_ICCCM_FOUND)
     integrationTest(NAME testQuickTiling SRCS quick_tiling_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testGlobalShortcuts SRCS globalshortcuts_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testSceneQPainter SRCS scene_qpainter_test.cpp LIBS XCB::ICCCM)
-    integrationTest(NAME testSceneQPainterShadow SRCS scene_qpainter_shadow_test.cpp LIBS XCB::ICCCM)
+    integrationTest(NAME testSceneQPainterShadow SRCS scene_qpainter_shadow_test.cpp LIBS SceneQPainterBackend XCB::ICCCM)
     integrationTest(NAME testStackingOrder SRCS stacking_order_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testDbusInterface SRCS dbus_interface_test.cpp LIBS XCB::ICCCM)
     integrationTest(NAME testXwaylandServerCrash SRCS xwaylandserver_crash_test.cpp LIBS XCB::ICCCM)

platformsupport/scenes/opengl/CMakeLists.txt

@@ -21,3 +21,4 @@ ecm_qt_declare_logging_category(SCENE_OPENGL_BACKEND_SRCS
 
 add_library(SceneOpenGLBackend STATIC ${SCENE_OPENGL_BACKEND_SRCS})
 target_link_libraries(SceneOpenGLBackend Qt5::Core Qt5::Widgets KF5::CoreAddons KF5::ConfigCore KF5::WindowSystem Plasma::KWaylandServer)
+target_include_directories(SceneOpenGLBackend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

platformsupport/scenes/qpainter/CMakeLists.txt

@@ -14,3 +14,4 @@ ecm_qt_declare_logging_category(SCENE_QPAINTER_BACKEND_SRCS
 
 add_library(SceneQPainterBackend STATIC ${SCENE_QPAINTER_BACKEND_SRCS})
 target_link_libraries(SceneQPainterBackend Qt5::Core)
+target_include_directories(SceneQPainterBackend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

platformsupport/scenes/xrender/CMakeLists.txt

@@ -9,3 +9,4 @@ ecm_qt_declare_logging_category(xrenderbackend_SOURCES
 
 add_library(SceneXRenderBackend STATIC ${xrenderbackend_SOURCES})
 target_link_libraries(SceneXRenderBackend kwin Qt5::Core Qt5::Gui)
+target_include_directories(SceneXRenderBackend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

plugins/platforms/drm/CMakeLists.txt

@@ -30,8 +30,6 @@ if (HAVE_EGL_STREAMS)
     )
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/opengl)
-
 add_library(KWinWaylandDrmBackend MODULE ${DRM_SOURCES})
 set_target_properties(KWinWaylandDrmBackend PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.waylandbackends/")
 target_link_libraries(KWinWaylandDrmBackend kwin Libdrm::Libdrm SceneQPainterBackend SceneOpenGLBackend)

plugins/platforms/drm/gbm_dmabuf.cpp

@@ -5,8 +5,8 @@
 */
 
 #include "gbm_dmabuf.h"
+#include "drm_fourcc.h"
 #include "kwineglimagetexture.h"
-#include "platformsupport/scenes/opengl/drm_fourcc.h"
 #include "main.h"
 #include "platform.h"
 #include <unistd.h>

plugins/platforms/drm/scene_qpainter_drm_backend.h

@@ -8,7 +8,8 @@
 */
 #ifndef KWIN_SCENE_QPAINTER_DRM_BACKEND_H
 #define KWIN_SCENE_QPAINTER_DRM_BACKEND_H
-#include <platformsupport/scenes/qpainter/qpainterbackend.h>
+#include "qpainterbackend.h"
+
 #include <QObject>
 #include <QVector>
 

plugins/platforms/fbdev/scene_qpainter_fb_backend.h

@@ -8,7 +8,7 @@
 */
 #ifndef KWIN_SCENE_QPAINTER_FB_BACKEND_H
 #define KWIN_SCENE_QPAINTER_FB_BACKEND_H
-#include <platformsupport/scenes/qpainter/qpainterbackend.h>
+#include "qpainterbackend.h"
 
 #include <QObject>
 #include <QImage>

plugins/platforms/virtual/CMakeLists.txt

@@ -5,8 +5,6 @@ set(VIRTUAL_SOURCES
     virtual_output.cpp
 )
 
-include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/opengl)
-
 include(ECMQtDeclareLoggingCategory)
 ecm_qt_declare_logging_category(VIRTUAL_SOURCES HEADER logging.h IDENTIFIER KWIN_VIRTUAL CATEGORY_NAME kwin_platform_virtual DEFAULT_SEVERITY Critical)
 

plugins/platforms/virtual/scene_qpainter_virtual_backend.h

@@ -9,7 +9,7 @@
 #ifndef KWIN_SCENE_QPAINTER_VIRTUAL_BACKEND_H
 #define KWIN_SCENE_QPAINTER_VIRTUAL_BACKEND_H
 
-#include <platformsupport/scenes/qpainter/qpainterbackend.h>
+#include "qpainterbackend.h"
 
 #include <QObject>
 #include <QVector>

plugins/platforms/wayland/CMakeLists.txt

@@ -12,7 +12,6 @@ if (HAVE_WAYLAND_EGL)
     endif()
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/opengl)
 add_library(KWinWaylandWaylandBackend MODULE ${WAYLAND_BACKEND_SOURCES})
 set_target_properties(KWinWaylandWaylandBackend PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.waylandbackends/")
 target_link_libraries(KWinWaylandWaylandBackend kwin KF5::WaylandClient SceneQPainterBackend)

plugins/platforms/wayland/scene_qpainter_wayland_backend.h

@@ -10,7 +10,7 @@
 #ifndef KWIN_SCENE_QPAINTER_WAYLAND_BACKEND_H
 #define KWIN_SCENE_QPAINTER_WAYLAND_BACKEND_H
 
-#include <platformsupport/scenes/qpainter/qpainterbackend.h>
+#include "qpainterbackend.h"
 
 #include <QObject>
 #include <QImage>

plugins/platforms/x11/common/CMakeLists.txt

@@ -4,6 +4,5 @@ endif()
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-int-to-void-pointer-cast")
 endif()
-include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/opengl)
 add_library(eglx11common STATIC eglonxbackend.cpp)
-target_link_libraries(eglx11common kwin)
+target_link_libraries(eglx11common kwin SceneOpenGLBackend)

plugins/platforms/x11/standalone/CMakeLists.txt

@@ -26,9 +26,6 @@ if (HAVE_EPOXY_GLX)
     set(X11PLATFORM_SOURCES ${X11PLATFORM_SOURCES} glxbackend.cpp glx_context_attribute_builder.cpp)
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/opengl)
-include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/xrender)
-
 add_library(KWinX11Platform MODULE ${X11PLATFORM_SOURCES})
 set_target_properties(KWinX11Platform PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.platforms/")
 target_link_libraries(KWinX11Platform eglx11common kwin kwinxrenderutils SceneOpenGLBackend VsyncSupport Qt5::X11Extras XCB::CURSOR KF5::Crash )

plugins/platforms/x11/windowed/CMakeLists.txt

@@ -6,9 +6,6 @@ set(X11BACKEND_SOURCES
     x11windowed_output.cpp
 )
 
-include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/opengl)
-include_directories(${CMAKE_SOURCE_DIR}/platformsupport/vsyncconvenience)
-
 add_library(KWinWaylandX11Backend MODULE ${X11BACKEND_SOURCES})
 set_target_properties(KWinWaylandX11Backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.waylandbackends/")
 target_link_libraries(KWinWaylandX11Backend eglx11common kwin kwinxrenderutils X11::XCB SceneQPainterBackend SceneOpenGLBackend VsyncSupport)

plugins/platforms/x11/windowed/scene_qpainter_x11_backend.h

@@ -9,7 +9,7 @@
 #ifndef KWIN_SCENE_QPAINTER_X11_BACKEND_H
 #define KWIN_SCENE_QPAINTER_X11_BACKEND_H
 
-#include <platformsupport/scenes/qpainter/qpainterbackend.h>
+#include "qpainterbackend.h"
 
 #include <QObject>
 #include <QImage>

plugins/scenes/opengl/scene_opengl.cpp

@@ -17,10 +17,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #include "scene_opengl.h"
+#include "texture.h"
 
 #include "platform.h"
 #include "wayland_server.h"
-#include "platformsupport/scenes/opengl/texture.h"
 
 #include <kwinglplatform.h>
 #include <kwineffectquickview.h>

plugins/scenes/opengl/scene_opengl.h

@@ -11,13 +11,14 @@
 #ifndef KWIN_SCENE_OPENGL_H
 #define KWIN_SCENE_OPENGL_H
 
+#include "openglbackend.h"
+
 #include "scene.h"
 #include "shadow.h"
 
 #include "kwinglutils.h"
 
 #include "decorations/decorationrenderer.h"
-#include "platformsupport/scenes/opengl/openglbackend.h"
 
 namespace KWin
 {

plugins/scenes/qpainter/scene_qpainter.h

@@ -9,8 +9,9 @@
 #ifndef KWIN_SCENE_QPAINTER_H
 #define KWIN_SCENE_QPAINTER_H
 
+#include "qpainterbackend.h"
+
 #include "scene.h"
-#include <platformsupport/scenes/qpainter/qpainterbackend.h>
 #include "shadow.h"
 
 #include "decorations/decorationrenderer.h"

plugins/scenes/xrender/CMakeLists.txt

@@ -12,8 +12,6 @@ ecm_qt_declare_logging_category(
         Critical
 )
 
-include_directories(${CMAKE_SOURCE_DIR}/platformsupport/scenes/xrender)
-
 add_library(KWinSceneXRender MODULE ${SCENE_XRENDER_SRCS})
 set_target_properties(KWinSceneXRender PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.scenes/")
 target_link_libraries(KWinSceneXRender kwin kwinxrenderutils SceneXRenderBackend)