diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-04-13 09:09:52 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago@macieira.org> | 2013-04-23 00:06:32 -0700 |
| commit | b1c9ed76dcae007e500da286dbfaa421d33b6d45 (patch) | |
| tree | fef0457b1f9fbbdd63b392c5a4484dc80e6be23a | |
| parent | c11ce7e1574889734fa010ad3d8379aa41720fdc (diff) | |
| download | subsurface-b1c9ed76dcae007e500da286dbfaa421d33b6d45.tar.gz | |
Cache the Qt tools detected (and detect RCC)
Since we're caching the include flags and linker flags, we should also
cache the exact helper binaries we're running. This avoids getting
errors because the environment changed.
Signed-off-by: Thiago Macieira <thiago@macieira.org>
| -rw-r--r-- | Configure.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Configure.mk b/Configure.mk index fa04a44ec..99292795a 100644 --- a/Configure.mk +++ b/Configure.mk @@ -75,9 +75,11 @@ QT_VERSION_MAJOR = $(shell $(QMAKE) -query QT_VERSION | cut -d. -f1) ifeq ($(QT_VERSION_MAJOR), 5) QT_MODULES = Qt5Widgets Qt5Svg QT_CORE = Qt5Core + QTBINDIR = $(shell $(QMAKE) -query QT_HOST_BINS) else QT_MODULES = QtGui QtSvg QT_CORE = QtCore + QTBINDIR = $(shell $(QMAKE) -query QT_INSTALL_BINS) endif # we need GLIB2CFLAGS for gettext @@ -86,6 +88,9 @@ LIBQT = $(shell $(PKGCONFIG) --libs $(QT_MODULES)) ifneq ($(filter reduce_relocations, $(shell $(PKGCONFIG) --variable qt_config $(QT_CORE))), ) QTCXXFLAGS += -fPIE endif +MOC = $(QTBINDIR)/moc +UIC = $(QTBINDIR)/uic +RCC = $(QTBINDIR)/rcc LIBGTK = $(shell $(PKGCONFIG) --libs gtk+-2.0 glib-2.0) ifneq (,$(filter $(UNAME),linux kfreebsd gnu)) @@ -128,6 +133,9 @@ configure $(CONFIGURE): Configure.mk LIBDIVECOMPUTER = $(LIBDIVECOMPUTER) \\\ LIBQT = $(LIBQT) \\\ QTCXXFLAGS = $(QTCXXFLAGS) \\\ + MOC = $(MOC) \\\ + UIC = $(UIC) \\\ + RCC = $(RCC) \\\ LIBGTK = $(LIBGTK) \\\ GTKCFLAGS = $(GTKCFLAGS) \\\ LIBGCONF2 = $(LIBGCONF2) \\\ |