[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9598 - in gnuradio/branches/developers/trondeau/qtgui
From: |
trondeau |
Subject: |
[Commit-gnuradio] r9598 - in gnuradio/branches/developers/trondeau/qtgui: config gr-qtgui/src/lib |
Date: |
Tue, 16 Sep 2008 22:31:38 -0600 (MDT) |
Author: trondeau
Date: 2008-09-16 22:31:37 -0600 (Tue, 16 Sep 2008)
New Revision: 9598
Modified:
gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
Log:
sets the include and library information for gr-qtgui to build with. Installs
standard in Ubuntu and Fedora 9.
Modified: gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
2008-09-17 04:30:38 UTC (rev 9597)
+++ gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
2008-09-17 04:31:37 UTC (rev 9598)
@@ -67,7 +67,7 @@
)
dnl If it was found, set the flags and move on
if test "$qwt_qwt_h" = "yes" ; then
- QWT_CFLAGS="$QWT_CFLAGS -Iqwt"
+ QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt"
else
dnl otherwise, check qwt-qt4/qwt.h (as in Ubuntu)
AC_CHECK_HEADER(
@@ -77,7 +77,7 @@
)
dnl if it was found, set the flags and move on
if test "$qwt_qt4_qwt_h" = "yes" ; then
- QWT_CFLAGS="$QWT_CFLAGS -Iqwt-qt4"
+ QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4"
else
dnl otherwise, qwt.h wasn't found, so set the flag to no
libqwt_ok=no
Modified: gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
2008-09-17 04:30:38 UTC (rev 9597)
+++ gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
2008-09-17 04:31:37 UTC (rev 9598)
@@ -47,12 +47,27 @@
[passed=no; AC_MSG_RESULT([gr-qtgui requires libQtCore.])])
PKG_CHECK_MODULES(QTGUI, QtGui >= 4.3.4, [],
[passed=no; AC_MSG_RESULT([gr-qtgui requires libQtGui.])])
+ PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.3.4, [],
+ [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL.])])
+
+ #AC_CHECK_OPENGL
AC_CHECK_LIB(GL, main, [],
[passed=no; AC_MSG_RESULT([gr-qtgui requires libGL.])])
dnl Fetch QWT variables
GR_QWT([], [passed=no])
- GR_QWTPLOT3D([], [passed=no])
+
+ dnl Process QWT Plot3D only if QWT passed
+ if test "$passed" = "yes"; then
+ GR_QWTPLOT3D([], [passed=no])
+ fi
+
+ dnl Export the include dirs and libraries (note: QTOPENGL_LIBS includes
links
+ dnl to QtCore and QtGui libraries
+ QT_INCLUDES="$QWT_CFLAGS $QWTPLOT3D_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
+ QT_LIBS="$QWT_LIBS $QWTPLOT3D_LIBS $QTOPENGL_LIBS"
+ AC_SUBST(QT_INCLUDES)
+ AC_SUBST(QT_LIBS)
fi
AC_CONFIG_FILES([ \
Modified:
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
2008-09-17 04:30:38 UTC (rev 9597)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
2008-09-17 04:31:37 UTC (rev 9598)
@@ -29,8 +29,7 @@
ourlibdir = $(grpyexecdir)/qtgui
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) \
- -I/usr/include/qt4 -I/usr/include/qwt -I/usr/include/qwtplot3d
-Iqtspectrum/ \
- -I/usr/include/qt4/QtCore -I/usr/include/qt4/Qt
-I/usr/include/qt4/QtGui -Iqtspectrum/.ui
+ $(QT_INCLUDES) -Iqtspectrum -Iqtspectrum/.ui
SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
@@ -87,7 +86,7 @@
$(PYTHON_LDFLAGS) \
$(GNURADIO_CORE_LA) \
-lstdc++ \
- -lGLU -lGL -lQtOpenGL -lQtGui -lQtCore -lqwt -lqwtplot3d
+ $(QT_LIBS)
qtgui.cc qtgui.py: qtgui.i $(ALL_IFILES)
$(SWIG) $(SWIGPYTHONARGS) -module qtgui -o qtgui.cc $(LOCAL_IFILES)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9598 - in gnuradio/branches/developers/trondeau/qtgui: config gr-qtgui/src/lib,
trondeau <=