Skip to content

Commit 755ac40

Browse files
committed
Correctly set include path in CFLAGS and CXXFLAGS
It appears that setting `INCLUDEPATH` in qmake break things. Because qmake add the include path using `-isystem`. We don't need to extract include path and define from PKGCONFIG_CFLAGS. Updating `CFLAGS` and `CXXFLAGS` is enough. No need for complex things. Fix #90 Fix kiwix/kiwix-build#260
1 parent a005a5c commit 755ac40

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

kiwix-desktop.pro

-11
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,6 @@ unix {
136136

137137
PKGCONFIG_CFLAGS = $$system(pkg-config --cflags $$PKGCONFIG_OPTION kiwix)
138138

139-
PKGCONFIG_INCLUDEPATH = $$find(PKGCONFIG_CFLAGS, ^-I.*)
140-
PKGCONFIG_INCLUDEPATH ~= s/^-I(.*)/\\1/g
141-
142-
PKGCONFIG_DEFINES = $$find(PKGCONFIG_CFLAGS, ^-D.*)
143-
PKGCONFIG_DEFINES ~= s/^-D(.*)/\\1/g
144-
145-
PKGCONFIG_CFLAGS ~= s/^-[ID].*//g
146-
147-
INCLUDEPATH *= $$PKGCONFIG_INCLUDEPATH
148-
DEFINES *= $$PKGCONFIG_DEFINES
149-
150139
QMAKE_CXXFLAGS += $$PKGCONFIG_CFLAGS
151140
QMAKE_CFLAGS += $$PKGCONFIG_CFLAGS
152141

0 commit comments

Comments
 (0)