diff options
| author | Donald Carr <donald.carr@nokia.com> | 2012-06-06 20:10:11 +0000 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2012-06-11 12:57:00 +0200 |
| commit | 4097fb07df32eb3c748b75088684dd17a15970c9 (patch) | |
| tree | 1f02160c17e5b699c8e7a9fa34e620d7a2402f9f /src/compositor | |
| parent | b0a4355c5320eecdf008521e1b40cd221e8352f2 (diff) | |
Introduce standard pkg-config usage
Use our own qualified pkg-config mkspec feature rather than directly
executing the system binary
Change-Id: I4b162cd8d2d9a8bd5d0b3adb9ca935df9ff96a69
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor.pri | 25 | ||||
| -rw-r--r-- | src/compositor/compositor.pro | 3 |
2 files changed, 4 insertions, 24 deletions
diff --git a/src/compositor/compositor.pri b/src/compositor/compositor.pri index 77467c2dd..d13391344 100644 --- a/src/compositor/compositor.pri +++ b/src/compositor/compositor.pri @@ -1,4 +1,4 @@ -CONFIG += module +CONFIG += module link_pkgconfig load(qt_module) MODULE_PRI += $$PWD/../../modules/qt_compositor.pri @@ -8,26 +8,9 @@ DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT DEFINES += QT_BUILD_COMPOSITOR_LIB !contains(QT_CONFIG, no-pkg-config) { - #If Qt uses pkg-config then override pkgconfig from mkspec - QMAKE_CFLAGS_WAYLAND=$$system(pkg-config --cflags wayland-server 2>/dev/null) - QMAKE_LIBS_WAYLAND_SERVER=$$system(pkg-config --libs-only-l wayland-server 2>/dev/null) - QMAKE_INCDIR_WAYLAND=$$system("pkg-config --cflags-only-I wayland-server 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'") - QMAKE_LIBDIR_WAYLAND=$$system("pkg-config --libs-only-L wayland-server 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'") - QMAKE_DEFINES_WAYLAND="" -} - -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND -QMAKE_CFLAGS += $$QMAKE_CFLAGS_WAYLAND -DEFINES += $$QMAKE_DEFINES_WAYLAND -LIBS += $$QMAKE_LIBS_WAYLAND_SERVER -!isEmpty(QMAKE_LIBDIR_WAYLAND) { - LIBS += -L$$QMAKE_LIBDIR_WAYLAND -} - -!isEmpty(QMAKE_LFLAGS_RPATH) { - !isEmpty(QMAKE_LIBDIR_WAYLAND) { - QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBS_WAYLAND} - } + PKGCONFIG += wayland-server +} else { + LIBS += -lwayland-server } HEADERS += qtcompositorversion.h diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 712541777..850e350dd 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -3,9 +3,6 @@ load(qt_module) TARGET = QtCompositor QPRO_PWD = $$PWD -# comment out the following to not use pkg-config in the pri files -CONFIG += use_pkgconfig - include (compositor.pri) load(qt_module_config) |