Ignore moc missing if MOC_FILES is empty (nw)

This commit is contained in:
Miodrag Milanovic 2015-04-01 12:09:38 +02:00
parent 627b7c61dc
commit 33387befdb

View File

@ -750,7 +750,9 @@ MOCTST = $(shell which moc-qt4 2>/dev/null)
ifeq '$(MOCTST)' '' ifeq '$(MOCTST)' ''
MOCTST = $(shell which moc 2>/dev/null) MOCTST = $(shell which moc 2>/dev/null)
ifeq '$(MOCTST)' '' ifeq '$(MOCTST)' ''
ifneq '$(MOC_FILES)' ''
$(error Qt's Meta Object Compiler (moc) wasn't found!) $(error Qt's Meta Object Compiler (moc) wasn't found!)
endif
else else
MOC = $(MOCTST) MOC = $(MOCTST)
endif endif