qmake: fix

MX-05 · Feb 19, 2018 · b32015e · b32015e
1 parent a3eabc8
commit b32015e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/INSTALL_LINUX.md b/INSTALL_LINUX.md
@@ -119,7 +119,7 @@ LIBS is the path to the libs
     expat: LIBS += -lexpat
     expat: PKGCONFIG -= expat
     cairo: PKGCONFIG -= cairo
-    PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig
+    PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig:$$(PKG_CONFIG_PATH)
     pyside: PKGCONFIG += pyside
     pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside)/QtCore
     pyside: INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside)/QtGui

diff --git a/global.pri b/global.pri
@@ -340,10 +340,9 @@ win32-g++ {
     expat:     PKGCONFIG += expat
     cairo:     PKGCONFIG += cairo
     shiboken:  PKGCONFIG += shiboken-py2
-    #PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig
     pyside:    PKGCONFIG += pyside-py2
-    pyside:    INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH:$$PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtCore
-    pyside:    INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH:$$PKG_CONFIG_PATH pkg-config --variable=includedir pyside-py2)/QtGui
+    pyside:    INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py2)/QtCore
+    pyside:    INCLUDEPATH += $$system(pkg-config --variable=includedir pyside-py2)/QtGui
     python:    PKGCONFIG += python-2.7
     boost:     LIBS += -lboost_serialization-mt
     boost:     LIBS += -lboost_serialization-mt
@@ -398,21 +397,21 @@ unix {
        QMAKE_LFLAGS += '-Wl,-rpath,\'@loader_path/../Frameworks\''
        shiboken {
          PKGCONFIG -= shiboken
-         PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig
-         INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH:$$PKG_CONFIG_PATH pkg-config --variable=includedir shiboken)
+         PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig:$$(PKG_CONFIG_PATH)
+         INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir shiboken)
          # the sed stuff is to work around an Xcode generator bug
-         LIBS += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH:$$PKG_CONFIG_PATH pkg-config --libs shiboken | sed -e s/-undefined\\ dynamic_lookup//)
+         LIBS += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --libs shiboken | sed -e s/-undefined\\ dynamic_lookup//)
        }
        pyside {
          PKGCONFIG -= pyside
-         PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig
-         INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH:$$PKG_CONFIG_PATH pkg-config --variable=includedir pyside)
-         INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH:$$PKG_CONFIG_PATH pkg-config --variable=includedir pyside)/QtCore
+         PYSIDE_PKG_CONFIG_PATH = $$system($$PYTHON_CONFIG --prefix)/lib/pkgconfig:$$(PKG_CONFIG_PATH)
+         INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside)
+         INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside)/QtCore
          # QtGui include are needed because it looks for Qt::convertFromPlainText which is defined in
          # qtextdocument.h in the QtGui module.
-         INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH:$$PKG_CONFIG_PATH pkg-config --variable=includedir pyside)/QtGui
+         INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --variable=includedir pyside)/QtGui
          INCLUDEPATH += $$system(env PKG_CONFIG_PATH=$${QMAKE_LIBDIR_QT}/pkgconfig pkg-config --variable=includedir QtGui)
-         LIBS += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH:$$PKG_CONFIG_PATH pkg-config --libs pyside)
+         LIBS += $$system(env PKG_CONFIG_PATH=$$PYSIDE_PKG_CONFIG_PATH pkg-config --libs pyside)
        }
      }
 } #unix