summaryrefslogtreecommitdiff
path: root/gr-qtgui
diff options
context:
space:
mode:
authorTom Rondeau2011-10-23 21:10:59 -0400
committerTom Rondeau2011-10-23 21:10:59 -0400
commitc63bb2453d9d0e0fc63de9eb9ce54249abacedd1 (patch)
tree99160f950c7ae2b27145525cdf4c7b602d2c944d /gr-qtgui
parent469cb5fd92ca7d1899e64b011d371f04e8830911 (diff)
parent9b58dc91c0bf5a87128a24d8e22a8e19aa974c9f (diff)
downloadgnuradio-c63bb2453d9d0e0fc63de9eb9ce54249abacedd1.tar.gz
gnuradio-c63bb2453d9d0e0fc63de9eb9ce54249abacedd1.tar.bz2
gnuradio-c63bb2453d9d0e0fc63de9eb9ce54249abacedd1.zip
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gr-qtgui')
-rw-r--r--gr-qtgui/CMakeLists.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
index 9caea38c7..6a9c39f9d 100644
--- a/gr-qtgui/CMakeLists.txt
+++ b/gr-qtgui/CMakeLists.txt
@@ -36,13 +36,20 @@ GR_PYTHON_CHECK_MODULE("PyQt4" PyQt4 True PYQT4_FOUND)
# Register component
########################################################################
include(GrComponent)
+if(NOT CMAKE_CROSSCOMPILING)
+ set(qt_gui_python_deps
+ PYQT4_FOUND
+ #we could check for pyqwt, but its not strictly required
+ )
+endif(NOT CMAKE_CROSSCOMPILING)
+
GR_REGISTER_COMPONENT("gr-qtgui" ENABLE_GR_QTGUI
Boost_FOUND
QT4_FOUND
QWT_FOUND
ENABLE_GR_CORE
PYTHONLIBS_FOUND
- PYQT4_FOUND
+ ${qt_gui_python_deps}
)
GR_SET_GLOBAL(GR_QTGUI_INCLUDE_DIRS