From 7a09a4bde747c38b9561dcc36e7eed6a99f9ea90 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 15 Nov 2012 01:54:48 -0800 Subject: set system wide test directories --- CMakeLists.txt | 6 ++++-- gnuradio | 2 +- 2 files changed, 5 insertions(+), 3 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 index d0b8fdd..2663f5e 160000 --- a/gnuradio +++ b/gnuradio @@ -1 +1 @@ -Subproject commit d0b8fdd18e008d921575f41c82aac95e0cc40539 +Subproject commit 2663f5e814fd90a11f1e235f68534f526d27d513 -- cgit