summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum2012-03-22 13:46:20 -0700
committerJosh Blum2012-03-22 13:46:20 -0700
commit116f82343080091df0c3c7efb61c202cadf30f3b (patch)
tree40a63c306f29ab8191bf0bae15072c247af9ae47
parentd9226e09495586279a06ec0e0af41e8ac6990970 (diff)
downloadgnuradio-116f82343080091df0c3c7efb61c202cadf30f3b.tar.gz
gnuradio-116f82343080091df0c3c7efb61c202cadf30f3b.tar.bz2
gnuradio-116f82343080091df0c3c7efb61c202cadf30f3b.zip
volk: added volk as depedency for various components
Its important to list the dependent libraries for a test so the library path can be correctly set. This is necessary on platforms without dynamic re-linking.
-rw-r--r--gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt4
-rw-r--r--gnuradio-core/src/tests/CMakeLists.txt4
-rw-r--r--gr-atsc/src/lib/CMakeLists.txt4
-rw-r--r--gr-atsc/src/python/CMakeLists.txt4
-rw-r--r--gr-digital/python/CMakeLists.txt4
-rw-r--r--gr-pager/python/CMakeLists.txt4
-rw-r--r--gr-qtgui/python/CMakeLists.txt4
-rw-r--r--gr-trellis/src/python/CMakeLists.txt4
-rw-r--r--gr-video-sdl/src/CMakeLists.txt4
-rw-r--r--gr-vocoder/python/CMakeLists.txt2
10 files changed, 19 insertions, 19 deletions
diff --git a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
index 912927921..3e75ead03 100644
--- a/gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt
+++ b/gnuradio-core/src/python/gnuradio/gr/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
#
@@ -46,7 +46,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gnuradio-core/src/python
${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
)
- set(GR_TEST_TARGET_DEPS gruel gnuradio-core)
+ set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gnuradio-core/src/tests/CMakeLists.txt b/gnuradio-core/src/tests/CMakeLists.txt
index 6de259116..34ad36568 100644
--- a/gnuradio-core/src/tests/CMakeLists.txt
+++ b/gnuradio-core/src/tests/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
#
@@ -63,7 +63,7 @@ endforeach(test_not_run_src)
# Set the test environment so the build libs will be found under MSVC.
########################################################################
include(GrTest)
-set(GR_TEST_TARGET_DEPS gruel gnuradio-core test-gnuradio-core)
+set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core test-gnuradio-core)
add_executable(gr_core_test_all test_all.cc)
target_link_libraries(gr_core_test_all test-gnuradio-core)
GR_ADD_TEST(gr-core-test-all gr_core_test_all)
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt
index d3d98b81d..dc51f0c90 100644
--- a/gr-atsc/src/lib/CMakeLists.txt
+++ b/gr-atsc/src/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011-212 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -129,7 +129,7 @@ list(APPEND test_atsci_sources
)
include(GrTest)
-set(GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-core gruel)
+set(GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-core gruel volk)
add_executable(test_atsci ${test_atsci_sources} test_atsci.cc)
target_link_libraries(test_atsci gnuradio-atsc gnuradio-core ${CPPUNIT_LIBRARIES})
GR_ADD_TEST(atsci-test test_atsci)
diff --git a/gr-atsc/src/python/CMakeLists.txt b/gr-atsc/src/python/CMakeLists.txt
index aca15c572..4c2442ba0 100644
--- a/gr-atsc/src/python/CMakeLists.txt
+++ b/gr-atsc/src/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011-2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -52,7 +52,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
${CMAKE_BINARY_DIR}/gr-atsc/src/lib
)
- set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-atsc)
+ set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-atsc)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt
index 905626b8b..c786b5a14 100644
--- a/gr-digital/python/CMakeLists.txt
+++ b/gr-digital/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011-212 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -71,7 +71,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-digital/python
${CMAKE_BINARY_DIR}/gr-digital/swig
)
- set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-digital)
+ set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-pager/python/CMakeLists.txt b/gr-pager/python/CMakeLists.txt
index bbbf35a71..08915aa00 100644
--- a/gr-pager/python/CMakeLists.txt
+++ b/gr-pager/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011-2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -43,7 +43,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-pager/python
${CMAKE_BINARY_DIR}/gr-pager/swig
)
- set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-pager)
+ set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-pager)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
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)
diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt
index 9a9cc6aed..66ca3eb13 100644
--- a/gr-trellis/src/python/CMakeLists.txt
+++ b/gr-trellis/src/python/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011-2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -31,7 +31,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-digital/swig
${CMAKE_BINARY_DIR}/gr-trellis/src/lib
)
- set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-digital gnuradio-trellis)
+ set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital gnuradio-trellis)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)
diff --git a/gr-video-sdl/src/CMakeLists.txt b/gr-video-sdl/src/CMakeLists.txt
index 3bfe9bb62..0c2069112 100644
--- a/gr-video-sdl/src/CMakeLists.txt
+++ b/gr-video-sdl/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011-2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -106,7 +106,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig
${CMAKE_BINARY_DIR}/gr-video-sdl/src
)
- set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-video-sdl)
+ set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-video-sdl)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING AND ENABLE_PYTHON)
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/CMakeLists.txt
index fff3fffbd..ee3765d5e 100644
--- a/gr-vocoder/python/CMakeLists.txt
+++ b/gr-vocoder/python/CMakeLists.txt
@@ -44,7 +44,7 @@ foreach(py_qa_test_file ${py_qa_test_files})
${CMAKE_BINARY_DIR}/gr-vocoder/python
${CMAKE_BINARY_DIR}/gr-vocoder/swig
)
- set(GR_TEST_TARGET_DEPS gruel gnuradio-core gnuradio-vocoder)
+ set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-vocoder)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file})
endforeach(py_qa_test_file)
endif(ENABLE_TESTING)