Merge PR #1: Update pkgconfig and include dir path

pull/3/head
Jenkins nymea 2019-10-10 22:55:55 +02:00
commit 6a649ac82b
2 changed files with 6 additions and 6 deletions

View File

@ -1,3 +1,3 @@
usr/lib/@DEB_HOST_MULTIARCH@/libnymea-networkmanager.so
usr/include/libnymea-networkmanager/* usr/include/libnymea-networkmanager
usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/libnymea-networkmanager.pc
usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/nymea-networkmanager.pc
usr/include/nymea-networkmanager/* usr/include/nymea-networkmanager

View File

@ -32,7 +32,7 @@ INSTALLS += target
# install header file with relative subdirectory
for(header, HEADERS) {
path = /usr/include/libnymea-networkmanager/$${dirname(header)}
path = $$[QT_INSTALL_PREFIX]/include/nymea-networkmanager/$${dirname(header)}
eval(headers_$${path}.files += $${header})
eval(headers_$${path}.path = $${path})
eval(INSTALLS *= headers_$${path})
@ -40,11 +40,11 @@ for(header, HEADERS) {
# Create pkgconfig file
CONFIG += create_pc create_prl no_install_prl
QMAKE_PKGCONFIG_NAME = libnymea-networkmanager
QMAKE_PKGCONFIG_NAME = nymea-networkmanager
QMAKE_PKGCONFIG_DESCRIPTION = nymea networkmanager development library
QMAKE_PKGCONFIG_PREFIX = $$[QT_INSTALL_PREFIX]
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_PREFIX]/include/libnymea-networkmanager/
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_PREFIX]/include/nymea-networkmanager/
QMAKE_PKGCONFIG_LIBDIR = $$target.path
QMAKE_PKGCONFIG_VERSION = $$VERSION_STRING
QMAKE_PKGCONFIG_FILE = libnymea-networkmanager
QMAKE_PKGCONFIG_FILE = nymea-networkmanager
QMAKE_PKGCONFIG_DESTDIR = pkgconfig