export the Qt top-level include dir as pkg-config ${includedir}
this seems more generic, and allows for more substitutions inside the generated files. Change-Id: I7a2e37036f9f9f7dbf7f28f0976ef427dd28ee82 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
787373d376
commit
bf9d099c47
@ -171,8 +171,8 @@ load(qt_installs)
|
|||||||
unix|win32-g++* {
|
unix|win32-g++* {
|
||||||
CONFIG += create_pc
|
CONFIG += create_pc
|
||||||
QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
|
QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw]
|
||||||
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]/$$MODULE_INCNAME
|
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
|
||||||
QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS/raw]
|
QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME
|
||||||
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
|
||||||
include_replace.match = $$[QT_INSTALL_HEADERS/get]
|
include_replace.match = $$[QT_INSTALL_HEADERS/get]
|
||||||
include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
|
||||||
|
Loading…
Reference in New Issue
Block a user