detect moc and uic; refs #28
This commit is contained in:
		
							
								
								
									
										10
									
								
								configure.in
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								configure.in
									
									
									
									
									
								
							| @@ -96,20 +96,30 @@ PKG_PROG_PKG_CONFIG | ||||
| # libraries | ||||
| PKG_CHECK_MODULES([QT_GUI], [QtCore QtGui], | ||||
|    [AC_DEFINE([HAVE_QTGUI]) | ||||
|     UIC=$(pkg-config --variable=uic_location QtCore) | ||||
|     MOC=$(pkg-config --variable=moc_location QtCore) | ||||
|     have_qtgui=1], | ||||
|    [PKG_CHECK_MODULES([QT_GUI], [Qt5Core Qt5Gui Qt5Widgets])], | ||||
|    [AC_DEFINE([HAVE_QTGUI]) | ||||
|     UIC=$(pkg-config --variable=uic_location Qt5Core) | ||||
|     MOC=$(pkg-config --variable=moc_location Qt5Core) | ||||
|     have_qtgui=1], | ||||
|    [have_qtgui=0]) | ||||
| AM_CONDITIONAL(HAVE_QTGUI, test "$have_qtgui" = "1") | ||||
| PKG_CHECK_MODULES([QT_NETWORK], [QtNetwork], | ||||
|    [AC_DEFINE([HAVE_QTNETWORK]) | ||||
|     UIC=$(pkg-config --variable=uic_location QtCore) | ||||
|     MOC=$(pkg-config --variable=moc_location QtCore) | ||||
|     have_qtnetwork=1], | ||||
|    [PKG_CHECK_MODULES([QT_NETWORK], [Qt5Network])], | ||||
|    [AC_DEFINE([HAVE_QTNETWORK]) | ||||
|     UIC=$(pkg-config --variable=uic_location Qt5Core) | ||||
|     MOC=$(pkg-config --variable=moc_location Qt5Core) | ||||
|     have_qtnetwork=1], | ||||
|    [have_qtnetwork=0]) | ||||
| AM_CONDITIONAL(HAVE_QTNETWORK, test "$have_qtnetwork" = "1") | ||||
| AC_SUBST(UIC) | ||||
| AC_SUBST(MOC) | ||||
|  | ||||
| AC_ARG_ENABLE(pedantic, | ||||
|   [AS_HELP_STRING([--enable-pedantic], | ||||
|   | ||||
| @@ -65,10 +65,10 @@ noinst_PROGRAMS = versiontest | ||||
| versiontest_SOURCES = versiontest.cxx | ||||
|  | ||||
| %_ui.hxx: %.ui | ||||
| 	uic -o $@ $< | ||||
| 	@UIC@ -o $@ $< | ||||
|  | ||||
| moc_%.cxx: %.hxx | ||||
| 	moc -o $@ $< | ||||
| 	@MOC@ -o $@ $< | ||||
|  | ||||
| clean-local: | ||||
| 	-rm -r ${QMAKE_TARGET}.app | ||||
|   | ||||
		Reference in New Issue
	
	Block a user