libraries/libpcscxx
1
0
Fork 0
Code Issues Releases Activity

detect moc and uic; refs #28

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-04-03 15:00:31 +00:00
parent 4f4fd9a5a9
commit 8e5f024514
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.in
View File

@@ -96,20 +96,30 @@ PKG_PROG_PKG_CONFIG
# libraries # libraries
PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui], PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui],
[AC_DEFINE([HAVE_QTGUI]) [AC_DEFINE([HAVE_QTGUI])
UIC=$(pkg-config --variable=uic_location QtCore)
MOC=$(pkg-config --variable=moc_location QtCore)
have_qtgui=1], have_qtgui=1],
[PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])], [PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])],
[AC_DEFINE([HAVE_QTGUI]) [AC_DEFINE([HAVE_QTGUI])
UIC=$(pkg-config --variable=uic_location Qt5Core)
MOC=$(pkg-config --variable=moc_location Qt5Core)
have_qtgui=1], have_qtgui=1],
[have_qtgui=0]) [have_qtgui=0])
AM_CONDITIONAL(HAVE_QTGUI, test "$have_qtgui" = "1") AM_CONDITIONAL(HAVE_QTGUI, test "$have_qtgui" = "1")
PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork], PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork],
[AC_DEFINE([HAVE_QTNETWORK]) [AC_DEFINE([HAVE_QTNETWORK])
UIC=$(pkg-config --variable=uic_location QtCore)
MOC=$(pkg-config --variable=moc_location QtCore)
have_qtnetwork=1], have_qtnetwork=1],
[PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])], [PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])],
[AC_DEFINE([HAVE_QTNETWORK]) [AC_DEFINE([HAVE_QTNETWORK])
UIC=$(pkg-config --variable=uic_location Qt5Core)
MOC=$(pkg-config --variable=moc_location Qt5Core)
have_qtnetwork=1], have_qtnetwork=1],
[have_qtnetwork=0]) [have_qtnetwork=0])
AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1") AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1")
AC_SUBST(UIC)
AC_SUBST(MOC)
AC_ARG_ENABLE(pedantic, AC_ARG_ENABLE(pedantic,
[AS_HELP_STRING([--enable-pedantic], [AS_HELP_STRING([--enable-pedantic],

4
src/makefile.am
View File

@@ -65,10 +65,10 @@ noinst_PROGRAMS = versiontest
versiontest_SOURCES = versiontest.cxx versiontest_SOURCES = versiontest.cxx
%_ui.hxx: %.ui %_ui.hxx: %.ui
uic -o $@ $< @UIC@ -o $@ $<
moc_%.cxx: %.hxx moc_%.cxx: %.hxx
moc -o $@ $< @MOC@ -o $@ $<
clean-local: clean-local:
-rm -r ${QMAKE_TARGET}.app -rm -r ${QMAKE_TARGET}.app