Merge pull request #131 from kiwix/fix_include_path

Correctly set include path in CFLAGS and CXXFLAGS
This commit is contained in:
Matthieu Gautier 2019-04-30 11:58:23 +02:00 committed by GitHub
commit c642209dc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -136,17 +136,6 @@ unix {
PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION kiwix)
PKGCONFIG_INCLUDEPATH = $$find(PKGCONFIG_CFLAGS, ^-I.*)
PKGCONFIG_INCLUDEPATH ~= s/^-I(.*)/\\1/g
PKGCONFIG_DEFINES = $$find(PKGCONFIG_CFLAGS, ^-D.*)
PKGCONFIG_DEFINES ~= s/^-D(.*)/\\1/g
PKGCONFIG_CFLAGS ~= s/^-[ID].*//g
INCLUDEPATH *= $$PKGCONFIG_INCLUDEPATH
DEFINES *= $$PKGCONFIG_DEFINES
QMAKE_CXXFLAGS += $$PKGCONFIG_CFLAGS
QMAKE_CFLAGS += $$PKGCONFIG_CFLAGS