diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-26 20:23:36 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-26 20:23:36 -0700 |
| commit | c73a73fddd47a059e81594505bbc7bc0418fcc85 (patch) | |
| tree | 3c48ce4d615a29262693443dbe5e8b530b01d574 | |
| parent | bcf47d4936f6f24175731f5e4c28a42f3d5de701 (diff) | |
| parent | d46cca751c5ddf6d2f9c78cf802c267b487d237e (diff) | |
Merge remote-tracking branch 'gnuradio-github/pr/1247'
| -rw-r--r-- | gr-atsc/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-atsc/swig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-dtv/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-dtv/swig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-fec/CMakeLists.txt | 1 |
5 files changed, 2 insertions, 9 deletions
diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt index 30eed3eb2..d51818104 100644 --- a/gr-atsc/CMakeLists.txt +++ b/gr-atsc/CMakeLists.txt @@ -27,11 +27,8 @@ include(GrBoost) ######################################################################## include(GrComponent) -find_package(GSL) - GR_REGISTER_COMPONENT("gr-atsc" ENABLE_GR_ATSC Boost_FOUND - GSL_FOUND ENABLE_GNURADIO_RUNTIME ENABLE_GR_FFT ENABLE_GR_BLOCKS diff --git a/gr-atsc/swig/CMakeLists.txt b/gr-atsc/swig/CMakeLists.txt index d2a70f8a6..8d02a00c2 100644 --- a/gr-atsc/swig/CMakeLists.txt +++ b/gr-atsc/swig/CMakeLists.txt @@ -40,7 +40,7 @@ endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/atsc_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/atsc) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) -set(GR_SWIG_LIBRARIES gnuradio-atsc gnuradio-fft ${GSL_LDFLAGS}) +set(GR_SWIG_LIBRARIES gnuradio-atsc gnuradio-fft) GR_SWIG_MAKE(atsc_swig atsc_swig.i) diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt index 9cca0b0f5..be710b602 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 8a91c6a8a..04b8b09ec 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) diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt index 338fe7186..cc96cda6e 100644 --- a/gr-fec/CMakeLists.txt +++ b/gr-fec/CMakeLists.txt @@ -34,7 +34,6 @@ GR_REGISTER_COMPONENT("gr-fec" ENABLE_GR_FEC Boost_FOUND ENABLE_GNURADIO_RUNTIME ENABLE_GR_BLOCKS - GSL_FOUND ) GR_SET_GLOBAL(GR_FEC_INCLUDE_DIRS |