Mercurial > mxe-octave

comparison src/default-octave.mk @ 4352:bf358512f67e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correctly locate cross-compiler versions of Qt tools (bug #50258). * default-octave.mk: Set environment variables for RCC_QTVER, UIC_QTVER, MOC_QTVER, LRELEASE_QTVER so that Octave configure script locates cross-compiler versions of these tools.
author Rik <rik@octave.org>
date Tue, 14 Feb 2017 11:35:52 -0800
parents 07671a76e291
children e9b032b9340a
comparison
equal deleted inserted replaced
4351:8bf7d78a7746 4352:bf358512f67e
53 endif 53 endif
54 54
55 ## If we allow the system Qt libraries to be used, then these 55 ## If we allow the system Qt libraries to be used, then these
56 ## won't make sense. 56 ## won't make sense.
57 $(PKG)_QT_CONFIGURE_OPTIONS := \ 57 $(PKG)_QT_CONFIGURE_OPTIONS := \
58 MOC=$(MXE_MOC) \ 58 MOC_QTVER=$(MXE_MOC) \
59 UIC=$(MXE_UIC) \ 59 UIC_QTVER=$(MXE_UIC) \
60 RCC=$(MXE_RCC) \ 60 RCC_QTVER=$(MXE_RCC) \
61 LRELEASE=$(MXE_LRELEASE) 61 LRELEASE_QTVER=$(MXE_LRELEASE)
62 62
63 ifeq ($(ENABLE_QT5),yes) 63 ifeq ($(ENABLE_QT5),yes)
64 #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig" 64 #$(PKG)_PKG_CONFIG_PATH := "$(HOST_LIBDIR)/pkgconfig"
65 $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig" 65 $(PKG)_PKG_CONFIG_PATH := "$(HOST_PREFIX)/qt5/lib/pkgconfig:$(HOST_LIBDIR)/pkgconfig"
66 $(PKG)_QTDIR := $(HOST_PREFIX)/qt5 66 $(PKG)_QTDIR := $(HOST_PREFIX)/qt5