From 18bb0bd0167ca1f22f3f33a467b247a1175fe8a6 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 23 Nov 2017 09:39:31 +0100 Subject: [PATCH] Fix finding qt5 tools under BSD Was leaving it disabled by default, now hopefully fixed --- source/Makefile.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/Makefile.mk b/source/Makefile.mk index e70a5cdeb..620a89e9c 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -226,11 +226,17 @@ endif ifeq ($(HAVE_QT5),true) QT5_LIBDIR = $(shell pkg-config --variable=libdir Qt5Core) +ifeq ($(BSD),true) +MOC_QT5 ?= $(QT5_LIBDIR)/bin/moc +RCC_QT5 ?= $(QT5_LIBDIR)/bin/rcc +UIC_QT5 ?= $(QT5_LIBDIR)/bin/uic +endif ifeq ($(MACOS),true) MOC_QT5 ?= $(QT5_LIBDIR)/../bin/moc RCC_QT5 ?= $(QT5_LIBDIR)/../bin/rcc UIC_QT5 ?= $(QT5_LIBDIR)/../bin/uic -else # MACOS +endif +ifeq ($(MOC_QT5),) ifneq (,$(wildcard $(QT5_LIBDIR)/qt5/bin/moc)) MOC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/moc RCC_QT5 ?= $(QT5_LIBDIR)/qt5/bin/rcc @@ -240,7 +246,7 @@ MOC_QT5 ?= $(QT5_LIBDIR)/qt/bin/moc RCC_QT5 ?= $(QT5_LIBDIR)/qt/bin/rcc UIC_QT5 ?= $(QT5_LIBDIR)/qt/bin/uic endif -endif # MACOS +endif ifeq (,$(wildcard $(MOC_QT5))) HAVE_QT5=false endif