summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Blum2013-09-15 15:03:20 -0700
committerJosh Blum2013-09-15 15:03:20 -0700
commit6f1417ea164b16854f82e1a4be1364ed027b676f (patch)
treeee7ec0889ef9204e7ba3a52cf7aef7330624ad98
parent332a8d3bcb324af1a34ba2a24c1dc9d901c1176d (diff)
downloadsandhi-6f1417ea164b16854f82e1a4be1364ed027b676f.tar.gz
sandhi-6f1417ea164b16854f82e1a4be1364ed027b676f.tar.bz2
sandhi-6f1417ea164b16854f82e1a4be1364ed027b676f.zip
gras: update submodules from gr shuffle
-rw-r--r--CMakeLists.txt15
m---------PMC0
m---------gr360
m---------gr370
4 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 075480e..1e57476 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,10 +108,16 @@ add_subdirectory(cmake/Modules)
########################################################################
# add gnuradio as sub-project
########################################################################
-set(GRDIR gr36)
+set(GRDIR gr37)
set(CMAKE_SOURCE_DIR ${GRAS_SOURCE_DIR}/${GRDIR})
set(CMAKE_BINARY_DIR ${GRAS_BINARY_DIR}/${GRDIR})
+set(GRAS_FOUND TRUE)
+#GRAS_INCLUDE_DIRS, GRAS_LIBRARIES set above
+set(PMC_FOUND TRUE)
+set(PMC_INCLUDE_DIRS ${GRAS_SOURCE_DIR}/PMC/include)
+set(PMC_LIBRARIES pmc)
+
#Theron isnt affected by boost thread issues.
#So we allow the gr black listed versions.
OPTION(ENABLE_BAD_BOOST "Enable known bad versions of Boost" ON)
@@ -160,13 +166,6 @@ list(APPEND GRAS_TEST_ENVIRONS "GRAS_ROOT=${GRAS_SOURCE_DIR}")
set(CMAKE_SOURCE_DIR ${GRAS_SOURCE_DIR}/grex)
set(CMAKE_BINARY_DIR ${GRAS_BINARY_DIR}/grex)
-set(GRAS_FOUND TRUE)
-#GRAS_INCLUDE_DIRS, GRAS_LIBRARIES set above
-
-set(PMC_FOUND TRUE)
-set(PMC_INCLUDE_DIRS ${GRAS_SOURCE_DIR}/PMC/include)
-set(PMC_LIBRARIES pmc)
-
#call include to force local include precedence
include_directories(${GRAS_INCLUDE_DIRS})
include_directories(${PMC_INCLUDE_DIRS})
diff --git a/PMC b/PMC
-Subproject a08e9bc5a4d5290a179b42eabf913302119830a
+Subproject a7c4df2b9d3707bc3e383164e7a6855c1ca9beb
diff --git a/gr36 b/gr36
-Subproject 6961a794356d413f81bfbf347ed84619b1125d2
+Subproject e25fe808cf6a20e9469d1380d497e23205a379b
diff --git a/gr37 b/gr37
-Subproject 88245fc4623b3df4214cf4bb81648a38c4bddc5
+Subproject d6213028e20970e3718ac7f2401fa574486a16b