diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-23 13:11:03 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-23 13:11:03 -0700 |
| commit | 697e0a4e59e81472b2d9bb1475940f46fdbf89fb (patch) | |
| tree | c194af6239d77613432a6fdecfe3c9cfba56431d /gr-dtv | |
| parent | 49d36df28d26abcd80b31f5e470fb57b33e77c14 (diff) | |
| parent | 065b0add8523e2f85afa0848391174889d1b61a9 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/CMakeLists.txt
gr-atsc/swig/CMakeLists.txt
Diffstat (limited to 'gr-dtv')
| -rw-r--r-- | gr-dtv/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-dtv/swig/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt index f045af5ef8..cf17d0971d 100644 --- a/gr-dtv/CMakeLists.txt +++ b/gr-dtv/CMakeLists.txt @@ -29,6 +29,7 @@ include(GrComponent) GR_REGISTER_COMPONENT("gr-dtv" ENABLE_GR_DTV Boost_FOUND + GSL_FOUND ENABLE_GNURADIO_RUNTIME ENABLE_GR_ANALOG ENABLE_GR_FILTER diff --git a/gr-dtv/swig/CMakeLists.txt b/gr-dtv/swig/CMakeLists.txt index 7e98fa3b45..b3fb4c3cdd 100644 --- a/gr-dtv/swig/CMakeLists.txt +++ b/gr-dtv/swig/CMakeLists.txt @@ -36,7 +36,7 @@ endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/dtv_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/dtv) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) -set(GR_SWIG_LIBRARIES gnuradio-dtv) +set(GR_SWIG_LIBRARIES gnuradio-dtv ${GSL_LDFLAGS}) GR_SWIG_MAKE(dtv_swig dtv_swig.i) |