If we use pkg-config we prob don't want to use the internal

copy of wayland but a version we pick up with pkg-config

diff --git a/examples/qwidget-compositor/qt-compositor.pro b/examples/qwidget-compositor/qt-compositor.pro
index ef427a9..6486d73 100644 (file)
--- a/examples/qwidget-compositor/qt-compositor.pro
+++ b/examples/qwidget-compositor/qt-compositor.pro
@@ -13,8 +13,6 @@ CONFIG += use_pkgconfig
 
 DESTDIR=$$PWD/../../bin/
 
-LIBS += -L ../../lib
-
 include (../../src/qt-compositor/qt-compositor.pri)
 
 # Input

diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri
index 2f9914e..58e1840 100644 (file)
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/qt-compositor/qt-compositor.pri
@@ -1,6 +1,16 @@
-LIBS += -lwayland-server -lffi
 INCLUDEPATH += $$PWD
 
+use_pkgconfig {
+    QMAKE_CXXFLAGS += $$system(pkg-config --cflags wayland-server)
+    #for some reason this is not included in the cflags line
+    INCLUDEPATH += $$system(pkg-config --variable=includedir wayland-server)
+    LIBS += $$system(pkg-config --libs wayland-server)
+} else {
+    INCLUDEPATH += $$PWD/../3rdparty/wayland
+    LIBS += -lwayland-server -lffi
+    LIBS += -L ../../lib
+}
+
 wayland_gl {
     system(echo "Qt-Compositor configured with openGL")
     QT += opengl
@@ -44,5 +54,3 @@ HEADERS += $$PWD/qtcompositor.h \
         $$PWD/private/wlshmbuffer.h \
         $$PWD/private/wldisplay.h \
         $$PWD/private/wlobject.h
-
-INCLUDEPATH += $$PWD/../3rdparty/wayland