From bf0f8fd266619b75a7ebb2378849f7e8731884b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
Date: Tue, 14 Oct 2014 13:43:24 +0200
Subject: [PATCH] Fix export header for WaylandServer

This makes it possible to install and then use it. Installation is still
commented since we can't give enough stability guarantees for now.

In detail:
- do not actually install headers
- generate the export header into Wayland/Server
- include it from there

REVIEW:120579
---
 src/wayland/CMakeLists.txt            | 11 +++++++++--
 src/wayland/compositor_interface.h    |  2 +-
 src/wayland/display.h                 |  2 +-
 src/wayland/output_interface.h        |  2 +-
 src/wayland/seat_interface.h          |  2 +-
 src/wayland/server/buffer_interface.h |  2 +-
 src/wayland/server/shell_interface.h  |  2 +-
 src/wayland/surface_interface.h       |  2 +-
 8 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/wayland/CMakeLists.txt b/src/wayland/CMakeLists.txt
index 066d564507..ab21e99e5b 100644
--- a/src/wayland/CMakeLists.txt
+++ b/src/wayland/CMakeLists.txt
@@ -9,7 +9,14 @@ set(SERVER_LIB_SRCS
 )
 
 add_library(KF5WaylandServer ${SERVER_LIB_SRCS})
-generate_export_header(KF5WaylandServer BASE_NAME KWaylandServer)
+generate_export_header(KF5WaylandServer
+    BASE_NAME
+        KWaylandServer
+    EXPORT_FILE_NAME
+        KWayland/Server/kwaylandserver_export.h
+)
+
+
 add_library(KF5::WaylandServer ALIAS KF5WaylandServer)
 
 target_include_directories(KF5WaylandServer INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KWayland/Server>")
@@ -33,7 +40,7 @@ set_target_properties(KF5WaylandServer PROPERTIES VERSION   ${KWAYLAND_VERSION_S
 # install(TARGETS KF5WaylandServer EXPORT KF5WaylandTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 #
 # install(FILES
-#   ${CMAKE_CURRENT_BINARY_DIR}/kwaylandserver_export.h
+#   ${CMAKE_CURRENT_BINARY_DIR}/KWayland/Server/kwaylandserver_export.h
 #   buffer_interface.h
 #   compositor_interface.h
 #   display.h
diff --git a/src/wayland/compositor_interface.h b/src/wayland/compositor_interface.h
index 60ea01a59c..7e6b2384a6 100644
--- a/src/wayland/compositor_interface.h
+++ b/src/wayland/compositor_interface.h
@@ -24,7 +24,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QObject>
 
-#include <kwaylandserver_export.h>
+#include <KWayland/Server/kwaylandserver_export.h>
 
 namespace KWayland
 {
diff --git a/src/wayland/display.h b/src/wayland/display.h
index 31cb24fc46..a47ece87eb 100644
--- a/src/wayland/display.h
+++ b/src/wayland/display.h
@@ -23,7 +23,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <QList>
 #include <QObject>
 
-#include <kwaylandserver_export.h>
+#include <KWayland/Server/kwaylandserver_export.h>
 
 struct wl_display;
 struct wl_event_loop;
diff --git a/src/wayland/output_interface.h b/src/wayland/output_interface.h
index eba9a32e51..f5acdc56c2 100644
--- a/src/wayland/output_interface.h
+++ b/src/wayland/output_interface.h
@@ -24,7 +24,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <QPoint>
 #include <QSize>
 
-#include <kwaylandserver_export.h>
+#include <KWayland/Server/kwaylandserver_export.h>
 
 struct wl_global;
 struct wl_client;
diff --git a/src/wayland/seat_interface.h b/src/wayland/seat_interface.h
index 18d2dba385..5e98ce4c44 100644
--- a/src/wayland/seat_interface.h
+++ b/src/wayland/seat_interface.h
@@ -23,7 +23,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <QObject>
 #include <QPoint>
 
-#include <kwaylandserver_export.h>
+#include <KWayland/Server/kwaylandserver_export.h>
 
 struct wl_client;
 struct wl_resource;
diff --git a/src/wayland/server/buffer_interface.h b/src/wayland/server/buffer_interface.h
index 9cf84c5f3b..9b507ca4d8 100644
--- a/src/wayland/server/buffer_interface.h
+++ b/src/wayland/server/buffer_interface.h
@@ -23,7 +23,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <QImage>
 #include <QObject>
 
-#include <kwaylandserver_export.h>
+#include <KWayland/Server/kwaylandserver_export.h>
 
 struct wl_resource;
 struct wl_shm_buffer;
diff --git a/src/wayland/server/shell_interface.h b/src/wayland/server/shell_interface.h
index 31f84044c7..8af6dc27a6 100644
--- a/src/wayland/server/shell_interface.h
+++ b/src/wayland/server/shell_interface.h
@@ -22,7 +22,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QObject>
 
-#include <kwaylandserver_export.h>
+#include <KWayland/Server/kwaylandserver_export.h>
 
 class QSize;
 struct wl_resource;
diff --git a/src/wayland/surface_interface.h b/src/wayland/surface_interface.h
index 31e0e75e3d..c98cc93f8f 100644
--- a/src/wayland/surface_interface.h
+++ b/src/wayland/surface_interface.h
@@ -25,7 +25,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <QObject>
 #include <QRegion>
 
-#include <kwaylandserver_export.h>
+#include <KWayland/Server/kwaylandserver_export.h>
 
 namespace KWayland
 {