Changeset 3016

Timestamp:

Jan 4, 2017, 1:51:53 PM (9 years ago)

Author:

bird

Message:

qt5.kmk: Find qt5 headers on arch linux.

File:

• trunk/kBuild/units/qt5.kmk (modified) (2 diffs)

trunk/kBuild/units/qt5.kmk

@@ -114 +114 @@
      export PATH_SDK_QT5
 
-     # Locate the include files.
+     # Locate the include files. Check for qglobalstatic.h (since 5.1) first.
      ifeq ($(PATH_SDK_QT5_INC),)
-      PATH_SDK_QT5_INC := $(patsubst %/QtCore/qglobal.h,%,$(firstword $(wildcard \
+      PATH_SDK_QT5_INC := $(patsubst %/QtCore/qglobalstatic.h,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET_DOT_ARCH)),/usr/include/$(type)/qt5/QtCore/qglobalstatic.h) \
+        $(PATH_SDK_QT5)/include/qt5/QtCore/qglobalstatic.h \
+        /usr/include/qt5/QtCore/qtglobalstatic.h \
+        /usr/local/include/qt5/QtCore/qtglobalstatic.h \
+        $(PATH_SDK_QT5)/include/QtCore/qglobalstatic.h \
+        /usr/include/qt/QtCore/qglobalstatic.h \
+        /usr/local/include/qt/QtCore/qglobalstatic.h \
+        )))
+      ifeq ($(PATH_SDK_QT5_INC),)
+       PATH_SDK_QT5_INC := $(patsubst %/QtCore/qglobal.h,%,$(firstword $(wildcard \
         $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET_DOT_ARCH)),/usr/include/$(type)/qt5/QtCore/qglobal.h) \
         $(PATH_SDK_QT5)/include/qt5/QtCore/qglobal.h \
@@ -123 +133 @@
         $(PATH_SDK_QT5)/include/QtCore/qglobal.h \
         )))
+      endif
       ifneq ($(PATH_SDK_QT5_INC),)
        export PATH_SDK_QT5_INC