diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-26 20:28:53 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-26 20:28:53 -0700 |
| commit | 1ccbb23b897e2b7b7ae057811c6b2fc1a08fd997 (patch) | |
| tree | 9353d20dfe4e89bf7c6ead36bd32bcb0cef4085f /gr-fec | |
| parent | 9d2486132a674fa5e50c74c8d01d371075b75b02 (diff) | |
| parent | c73a73fddd47a059e81594505bbc7bc0418fcc85 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/CMakeLists.txt
gr-atsc/swig/CMakeLists.txt
Diffstat (limited to 'gr-fec')
| -rw-r--r-- | gr-fec/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gr-fec/CMakeLists.txt b/gr-fec/CMakeLists.txt index c828fd92e7..6938a97d08 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 |