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
This commit is contained in:
Sebastian Kügler 2014-10-14 13:43:24 +02:00
parent 410c414bad
commit bf0f8fd266
8 changed files with 16 additions and 9 deletions

View file

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

View file

@ -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
{

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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
{