Changeset 2972

Timestamp:

Sep 27, 2016, 1:25:53 PM (9 years ago)

Author:

bird

Message:

qt5.kmk: Look for it in more places.

File:

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

trunk/kBuild/units/qt5.kmk

@@ -116 +116 @@
      ifeq ($(PATH_SDK_QT5_INC),)
       PATH_SDK_QT5_INC := $(patsubst %/QtCore/qglobal.h,%,$(firstword $(wildcard \
-        $(PATH_SDK_QT5)/include/QtCore/qglobal.h \
+        $(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 \
         /usr/include/qt5/QtCore/qtglobal.h \
         /usr/local/include/qt5/QtCore/qtglobal.h \
+        $(PATH_SDK_QT5)/include/QtCore/qglobal.h \
         )))
       ifneq ($(PATH_SDK_QT5_INC),)
@@ -133 +134 @@
         /usr/lib32/libQt5Core$(SUFF_DLL) \
         /usr/lib32/qt5/libQt5Core$(SUFF_DLL) \
-        /usr/lib/i386-linux-gnu/libQt5Core$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET).x86),/usr/lib/$(type)/libQt5Core$(SUFF_DLL)) \
         /usr/local/lib32/libQt5Core$(SUFF_DLL) \
         /usr/local/lib32/qt5/libQt5Core$(SUFF_DLL) \
-        /usr/local/lib/i386-linux-gnu/libQt5Core$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET).x86),/usr/local/lib/$(type)/libQt5Core$(SUFF_DLL)) \
         $(PATH_SDK_QT5)/lib/libQt5Core$(SUFF_DLL) \
         $(PATH_SDK_QT5)/lib/qt5/libQt5Core$(SUFF_DLL) \
@@ -153 +154 @@
         /usr/lib64/qt5/libQt5Core$(SUFF_DLL) \
         /usr/lib/amd64/libQt5Core$(SUFF_DLL) \
-        /usr/lib/x86_64-linux-gnu/libQt5Core$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET).amd64),/usr/lib/$(type)/libQt5Core$(SUFF_DLL)) \
         /usr/local/lib64/libQt5Core$(SUFF_DLL) \
         /usr/local/lib64/qt5/libQt5Core$(SUFF_DLL) \
         /usr/local/lib/amd64/libQt5Core$(SUFF_DLL) \
-        /usr/local/lib/x86_64-linux-gnu/libQt5Core$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.$(KBUILD_TARGET).amd64),/usr/local/lib/$(type)/libQt5Core$(SUFF_DLL)) \
         $(PATH_SDK_QT5)/lib/libQt5Core$(SUFF_DLL) \
         $(PATH_SDK_QT5)/lib/qt5/libQt5Core$(SUFF_DLL) \
@@ -176 +177 @@
         /usr/lib/libQt5Core$(SUFF_DLL) \
         /usr/lib/qt5/libQt5Core$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_TARGET_DOT_ARCH),/usr/lib/$(type)/libQt5Core$(SUFF_DLL)) \
         /usr/local/lib/libQt5Core$(SUFF_DLL) \
         /usr/local/lib/qt5/libQt5Core$(SUFF_DLL) \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_TARGET_DOT_ARCH),/usr/local/lib/$(type)/libQt5Core$(SUFF_DLL)) \
         )))
       endif
@@ -245 +248 @@
   ifneq ($(TOOL_QT5_BIN_SUFF),)
    PATH_TOOL_QT5_BIN := $(patsubst %/moc$(TOOL_QT5_BIN_SUFF),%,$(firstword $(wildcard \
+         $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/moc$(TOOL_QT5_BIN_SUFF)) \
          /usr/lib/qt5/bin/moc$(TOOL_QT5_BIN_SUFF) \
          /usr/qt/5/bin/moc$(TOOL_QT5_BIN_SUFF) \
@@ -253 +257 @@
   else
    PATH_TOOL_QT5_BIN := $(patsubst %/moc-qt5,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/moc-qt5) \
         /usr/lib/qt5/bin/moc-qt5 \
         /usr/qt/5/bin/moc-qt5 \
@@ -264 +269 @@
     # If no luck, try looking for moc in the qt5 specific locations.
     PATH_TOOL_QT5_BIN := $(patsubst %/moc,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/moc) \
         /usr/lib/qt5/bin/moc \
         /usr/qt/5/bin/moc \
@@ -273 +279 @@
   ifeq ($(PATH_TOOL_QT5_BIN),)
    PATH_TOOL_QT5_BIN := $(patsubst %/qt4to5,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/qt4to5) \
         /usr/lib/qt5/bin/qt4to5 \
         /usr/qt/5/bin/qt4to5 \
@@ -282 +289 @@
   ifeq ($(PATH_TOOL_QT5_BIN),)
    PATH_TOOL_QT5_BIN := $(patsubst %/rcc$(TOOL_QT5_BIN_SUFF),%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/rcc$(TOOL_QT5_BIN_SUFF)) \
         /usr/lib/qt5/bin/rcc$(TOOL_QT5_BIN_SUFF) \
         /usr/qt/5/bin/rcc$(TOOL_QT5_BIN_SUFF) \
@@ -291 +299 @@
   if "$(PATH_TOOL_QT5_BIN)" == "" && "$(TOOL_QT5_BIN_SUFF)" != ""
    PATH_TOOL_QT5_BIN := $(patsubst %/rcc,%,$(firstword $(wildcard \
+        $(foreach type,$(KBUILD_OSARCH_2_GNU_SYSTEM_TYPES.KBUILD_HOST_DOT_ARCH),/usr/lib/$(type)/qt5/bin/rcc) \
         /usr/lib/qt5/bin/rcc \
         /usr/qt/5/bin/rcc \