mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cache the Qt tools detected (and detect RCC)

Browse source 
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>
This commit is contained in:
Thiago Macieira 2013-04-13 09:09:52 -07:00
parent c11ce7e157
commit b1c9ed76dc
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Configure.mk
View file

@ -75,9 +75,11 @@ QT_VERSION_MAJOR = $(shell $(QMAKE) -query QT_VERSION | cut -d. -f1)
ifeq ($(QT_VERSION_MAJOR), 5) ifeq ($(QT_VERSION_MAJOR), 5)
QT_MODULES = Qt5Widgets Qt5Svg QT_MODULES = Qt5Widgets Qt5Svg
QT_CORE = Qt5Core QT_CORE = Qt5Core
QTBINDIR = $(shell $(QMAKE) -query QT_HOST_BINS)
else else
QT_MODULES = QtGui QtSvg QT_MODULES = QtGui QtSvg
QT_CORE = QtCore QT_CORE = QtCore
QTBINDIR = $(shell $(QMAKE) -query QT_INSTALL_BINS)
endif endif
# we need GLIB2CFLAGS for gettext # 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))), ) ifneq ($(filter reduce_relocations, $(shell $(PKGCONFIG) --variable qt_config $(QT_CORE))), )
QTCXXFLAGS += -fPIE QTCXXFLAGS += -fPIE
endif endif
MOC = $(QTBINDIR)/moc
UIC = $(QTBINDIR)/uic
RCC = $(QTBINDIR)/rcc
LIBGTK = $(shell $(PKGCONFIG) --libs gtk+-2.0 glib-2.0) LIBGTK = $(shell $(PKGCONFIG) --libs gtk+-2.0 glib-2.0)
ifneq (,$(filter $(UNAME),linux kfreebsd gnu)) ifneq (,$(filter $(UNAME),linux kfreebsd gnu))
@ -128,6 +133,9 @@ configure $(CONFIGURE): Configure.mk
LIBDIVECOMPUTER = $(LIBDIVECOMPUTER) \\\ LIBDIVECOMPUTER = $(LIBDIVECOMPUTER) \\\
LIBQT = $(LIBQT) \\\ LIBQT = $(LIBQT) \\\
QTCXXFLAGS = $(QTCXXFLAGS) \\\ QTCXXFLAGS = $(QTCXXFLAGS) \\\
MOC = $(MOC) \\\
UIC = $(UIC) \\\
RCC = $(RCC) \\\
LIBGTK = $(LIBGTK) \\\ LIBGTK = $(LIBGTK) \\\
GTKCFLAGS = $(GTKCFLAGS) \\\ GTKCFLAGS = $(GTKCFLAGS) \\\
LIBGCONF2 = $(LIBGCONF2) \\\ LIBGCONF2 = $(LIBGCONF2) \\\