summaryrefslogtreecommitdiff
path: root/gr-qtgui
diff options
context:
space:
mode:
authorJohnathan Corgan2012-03-22 15:07:04 -0700
committerJohnathan Corgan2012-03-22 15:07:04 -0700
commita21499503e97189644b882ec12210ed4fa501414 (patch)
treed230144dec0bb46507a536079f5c10c03ad829df /gr-qtgui
parentb62700ab8fad6343378b816a2e4f88170bf7d8dd (diff)
parent69c9100b8221f8b485e3acc07e99d5f410909d5e (diff)
downloadgnuradio-a21499503e97189644b882ec12210ed4fa501414.tar.gz
gnuradio-a21499503e97189644b882ec12210ed4fa501414.tar.bz2
gnuradio-a21499503e97189644b882ec12210ed4fa501414.zip
Merge branch 'master' into next
Diffstat (limited to 'gr-qtgui')
-rw-r--r--gr-qtgui/python/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-qtgui/python/CMakeLists.txt b/gr-qtgui/python/CMakeLists.txt
index e61b54f08..e3fd602ef 100644
--- a/gr-qtgui/python/CMakeLists.txt
+++ b/gr-qtgui/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2010-2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -40,7 +40,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-qtgui/python
${CMAKE_BINARY_DIR}/gr-qtgui/swig
)
- set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-qtgui)
+ set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-qtgui)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)