summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum2012-11-15 01:54:48 -0800
committerJosh Blum2012-11-15 01:54:48 -0800
commit7a09a4bde747c38b9561dcc36e7eed6a99f9ea90 (patch)
tree940c903f41af86070c9d3941f26b43636f931d25
parent003319bb7aca18e14f513d92adba3dd58f2d2e08 (diff)
downloadsandhi-7a09a4bde747c38b9561dcc36e7eed6a99f9ea90.tar.gz
sandhi-7a09a4bde747c38b9561dcc36e7eed6a99f9ea90.tar.bz2
sandhi-7a09a4bde747c38b9561dcc36e7eed6a99f9ea90.zip
set system wide test directories
-rw-r--r--CMakeLists.txt6
m---------gnuradio0
2 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5674e5e..967aff2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,10 +73,12 @@ add_subdirectory(tests)
set(CMAKE_SOURCE_DIR ${GRAS_SOURCE_DIR}/gnuradio)
set(CMAKE_BINARY_DIR ${GRAS_BINARY_DIR}/gnuradio)
-set(GR_TEST_EXTRA_PYTHON_DIRS ${GRAS_PYTHON_DIRS}) #helps QA tests
-
set(GRAS_LIBRARIES gras) #for submodule linking
+#append gras deps for test code:
+list(APPEND GR_TEST_TARGET_DEPS ${GRAS_LIBRARIES})
+list(APPEND GR_TEST_PYTHON_DIRS ${GRAS_PYTHON_DIRS})
+
set(CMAKE_PROJECT_NAME gnuradio) #for submodule vars
add_subdirectory(gnuradio)
diff --git a/gnuradio b/gnuradio
-Subproject d0b8fdd18e008d921575f41c82aac95e0cc4053
+Subproject 2663f5e814fd90a11f1e235f68534f526d27d51