diff options
author | Josh Blum | 2013-09-15 22:17:42 -0700 |
---|---|---|
committer | Josh Blum | 2013-09-15 22:17:42 -0700 |
commit | adfedc68b7f4348a0aad7e5e63a74b0c412ec128 (patch) | |
tree | 9de5be6ce362241ba53aec8d393dc24f13f69252 | |
parent | c4b43b3521f373bc91cd3165b96ced0cb9cf65c1 (diff) | |
download | sandhi-adfedc68b7f4348a0aad7e5e63a74b0c412ec128.tar.gz sandhi-adfedc68b7f4348a0aad7e5e63a74b0c412ec128.tar.bz2 sandhi-adfedc68b7f4348a0aad7e5e63a74b0c412ec128.zip |
gras: add GRDIR config hook + sm update
-rw-r--r-- | CMakeLists.txt | 4 | ||||
m--------- | gr37 | 0 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ef24ec1..dad3ac4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,9 @@ add_subdirectory(cmake/Modules) ######################################################################## # add gnuradio as sub-project ######################################################################## -set(GRDIR gr36) +if(NOT GRDIR) + set(GRDIR gr36) +endif() set(CMAKE_SOURCE_DIR ${GRAS_SOURCE_DIR}/${GRDIR}) set(CMAKE_BINARY_DIR ${GRAS_BINARY_DIR}/${GRDIR}) diff --git a/gr37 b/gr37 -Subproject b7aeb732ebf3b13078da236e5556d3f090b43d4 +Subproject dbd9095bf783f9c883361f651a5252d98bca65d |