diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-26 20:35:38 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-26 20:35:38 -0700 |
| commit | b3b63be28857d04004a337b7c0bebfad06bc2e7c (patch) | |
| tree | c342453f13e18d0b961258c94a45f511fee47f5a /gr-dtv | |
| parent | d5777e144390ad15145c6ed30473e8bd923ae5ab (diff) | |
| parent | 5b2d034944090aa2089c1509555caf78bf61217b (diff) | |
Merge branch 'next' into python3
Diffstat (limited to 'gr-dtv')
| -rw-r--r-- | gr-dtv/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-dtv/swig/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt index 365df16aa1..7cec975115 100644 --- a/gr-dtv/CMakeLists.txt +++ b/gr-dtv/CMakeLists.txt @@ -27,11 +27,8 @@ include(GrBoost) ######################################################################## include(GrComponent) -find_package(GSL) - 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 b3fb4c3cdd..7e98fa3b45 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 ${GSL_LDFLAGS}) +set(GR_SWIG_LIBRARIES gnuradio-dtv) GR_SWIG_MAKE(dtv_swig dtv_swig.i) |