diff options
| author | Josh Blum | 2013-09-15 15:03:20 -0700 |
|---|---|---|
| committer | Josh Blum | 2013-09-15 15:03:20 -0700 |
| commit | 6f1417ea164b16854f82e1a4be1364ed027b676f (patch) | |
| tree | ee7ec0889ef9204e7ba3a52cf7aef7330624ad98 /CMakeLists.txt | |
| parent | 332a8d3bcb324af1a34ba2a24c1dc9d901c1176d (diff) | |
| download | sandhi-6f1417ea164b16854f82e1a4be1364ed027b676f.tar.gz sandhi-6f1417ea164b16854f82e1a4be1364ed027b676f.tar.bz2 sandhi-6f1417ea164b16854f82e1a4be1364ed027b676f.zip | |
gras: update submodules from gr shuffle
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 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}) |