Browse Source

Fix finding qt5 tools under BSD

Was leaving it disabled by default, now hopefully fixed
tags/1.9.8
falkTX 8 years ago
parent
commit
18bb0bd016
1 changed files with 8 additions and 2 deletions
  1. +8
    -2
      source/Makefile.mk

+ 8
- 2
source/Makefile.mk View File

@@ -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


Loading…
Cancel
Save