[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9624 - in gnuradio/branches/developers/trondeau/qtgui
From: |
trondeau |
Subject: |
[Commit-gnuradio] r9624 - in gnuradio/branches/developers/trondeau/qtgui: config gr-qtgui/src/lib gr-qtgui/src/lib/qtspectrum |
Date: |
Sat, 20 Sep 2008 13:55:37 -0600 (MDT) |
Author: trondeau
Date: 2008-09-20 13:55:36 -0600 (Sat, 20 Sep 2008)
New Revision: 9624
Added:
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro.in
Removed:
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro
Modified:
gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
gnuradio/branches/developers/trondeau/qtgui/config/gr_qwtplot3d.m4
gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
Log:
building QMAKE_INCLUDES from the CFLAGS variables; this variable is only used
in the qmake project file to find qwt.h and freinds.
Modified: gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
2008-09-20 19:27:40 UTC (rev 9623)
+++ gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
2008-09-20 19:55:36 UTC (rev 9624)
@@ -68,7 +68,6 @@
dnl If it was found, set the flags and move on
if test "$qwt_qwt_h" = "yes" ; then
QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt"
- QWT_INCLUDES="$QWT_INCLUDES /usr/include/qwt"
else
dnl otherwise, check qwt-qt4/qwt.h (as in Ubuntu)
AC_CHECK_HEADER(
@@ -79,7 +78,6 @@
dnl if it was found, set the flags and move on
if test "$qwt_qt4_qwt_h" = "yes" ; then
QWT_CFLAGS="$QWT_CFLAGS -I/usr/include/qwt-qt4"
- QWT_INCLUDES="$QWT_INCLUDES /usr/include/qwt-qt4"
else
dnl otherwise, qwt.h wasn't found, so set the flag to no
libqwt_ok=no
@@ -150,6 +148,5 @@
dnl Export our variables
AC_SUBST(QWT_CFLAGS)
- AC_SUBST(QWT_INCLUDES)
AC_SUBST(QWT_LIBS)
])
Modified: gnuradio/branches/developers/trondeau/qtgui/config/gr_qwtplot3d.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/gr_qwtplot3d.m4
2008-09-20 19:27:40 UTC (rev 9623)
+++ gnuradio/branches/developers/trondeau/qtgui/config/gr_qwtplot3d.m4
2008-09-20 19:55:36 UTC (rev 9624)
@@ -67,7 +67,6 @@
dnl If it was found, set the flags and move on
if test "$qwtplot3d_qwtplot3d_h" = "yes" ; then
QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I/usr/include/qwtplot3d"
- QWTPLOT3D_INCLUDES="$QWTPLOT3D_INCLUDES /usr/include/qwtplot3d"
else
dnl otherwise, check qwtplot3d-qt4/qwtplot3d.h (as in Ubuntu)
AC_CHECK_HEADER(
@@ -78,7 +77,6 @@
dnl if it was found, set the flags and move on
if test "$qwtplot3d_qt4_qwtplot3d_h" = "yes" ; then
QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS
-I/usr/include/qwtplot3d-qt4"
- QWTPLOT3D_INCLUDES="$QWTPLOT3D_INCLUDES
/usr/include/qwtplot3d-qt4"
else
dnl otherwise, qwtplot3d.h wasn't found, so set the flag to no
libqwtplot3d_ok=no
@@ -87,7 +85,6 @@
else
dnl Using the user-specified include directory
QWTPLOT3D_CFLAGS="$QWTPLOT3D_CFLAGS -I$qwtplot3d_incdir"
- QWTPLOT3D_INCLUDES="$QWTPLOT3D_INCLUDES $qwtplot3d_incdir"
AC_CHECK_HEADER(
[$qwtplot3d_incdir/qwt3d_plot.h],
[],
@@ -150,6 +147,5 @@
dnl Export our variables
AC_SUBST(QWTPLOT3D_CFLAGS)
- AC_SUBST(QWTPLOT3D_INCLUDES)
AC_SUBST(QWTPLOT3D_LIBS)
])
Modified: gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
2008-09-20 19:27:40 UTC (rev 9623)
+++ gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
2008-09-20 19:55:36 UTC (rev 9624)
@@ -58,10 +58,17 @@
dnl Export the include dirs and libraries (note: QTOPENGL_LIBS includes
links
dnl to QtCore and QtGui libraries)
- QT_CFLAGS="$QWT_CFLAGS $QWTPLOT3D_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
- QT_INCLUDES="$QWT_INCLUDES $QWTPLOT3D_INCLUDES $QTCORE_CFLAGS_ONLY_I
$QTGUI_CFLAGS_ONLY_I"
+ QT_INCLUDES="$QWT_CFLAGS $QWTPLOT3D_CFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
QT_LIBS="$QWT_LIBS $QWTPLOT3D_LIBS $QTOPENGL_LIBS"
- AC_SUBST(QT_CFLAGS)
+
+ dnl Build an includes variable specifically for running qmake by
extracting
+ dnl all includes from the QWT and QWTPLOT3D, without the -I;
+ dnl qmake appends the -I when processing the project file INCLUDEPATH
+ for i in $QWT_CFLAGS $QWTPLOT3D_CFLAGS; do
+ QMAKE_INCLUDES="$QMAKE_INCLUDES ${i##-I}"
+ done
+
+ AC_SUBST(QMAKE_INCLUDES)
AC_SUBST(QT_INCLUDES)
AC_SUBST(QT_LIBS)
fi
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-20 19:27:40 UTC (rev 9623)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
2008-09-20 19:55:36 UTC (rev 9624)
@@ -32,7 +32,7 @@
ourlibdir = $(grpyexecdir)/qtgui
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
- $(QT_CFLAGS) -Iqtspectrum -Iqtspectrum/.ui $(WITH_INCLUDES)
+ $(QT_INCLUDES) -Iqtspectrum -Iqtspectrum/.ui $(WITH_INCLUDES)
SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
$(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
Deleted:
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro
Added:
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro.in
===================================================================
---
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro.in
(rev 0)
+++
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/specDisplay.pro.in
2008-09-20 19:55:36 UTC (rev 9624)
@@ -0,0 +1,42 @@
+TEMPLATE = app
+LANGUAGE = C++
+
+CONFIG += qt warn_on release thread opengl qwt qwtplot3d
+
+INCLUDEPATH += @QMAKE_INCLUDES@
+LIBS += @QT_LIBS@
+
+HEADERS = FrequencyDisplayPlot.hpp \
+ highResTimeFunctions.hpp \
+ plot_waterfall.hpp \
+ SpectrumGUIClass.hpp \
+ spectrumUpdateEvents.hpp \
+ TimeDomainDisplayPlot.hpp \
+ Waterfall3DDisplayPlot.hpp \
+ WaterfallDisplayPlot.hpp \
+ waterfallGlobalData.hpp \
+ spectrumdisplayform.hpp
+
+SOURCES = FrequencyDisplayPlot.cpp \
+ plot_waterfall.cpp \
+ SpectrumGUIClass.cpp \
+ spectrumUpdateEvents.cpp \
+ TimeDomainDisplayPlot.cpp \
+ Waterfall3DDisplayPlot.cpp \
+ WaterfallDisplayPlot.cpp \
+ waterfallGlobalData.cpp \
+ spectrumdisplayform.cpp \
+ main.cpp
+
+#The following line was changed from FORMS to FORMS3 by qt3to4
+FORMS = spectrumdisplayform.ui
+
+unix {
+ UI_DIR = .ui
+ MOC_DIR = .moc
+ OBJECTS_DIR = .obj
+}
+
+#The following line was inserted by qt3to4
+QT += opengl
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9624 - in gnuradio/branches/developers/trondeau/qtgui: config gr-qtgui/src/lib gr-qtgui/src/lib/qtspectrum,
trondeau <=