summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2017-03-26 20:35:38 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2017-03-26 20:35:38 -0700
commitb3b63be28857d04004a337b7c0bebfad06bc2e7c (patch)
treec342453f13e18d0b961258c94a45f511fee47f5a
parentd5777e144390ad15145c6ed30473e8bd923ae5ab (diff)
parent5b2d034944090aa2089c1509555caf78bf61217b (diff)
Merge branch 'next' into python3
-rw-r--r--config.h.in6
-rw-r--r--docs/doxygen/other/logger.dox6
-rw-r--r--gr-dtv/CMakeLists.txt3
-rw-r--r--gr-dtv/swig/CMakeLists.txt2
-rw-r--r--gr-fec/CMakeLists.txt1
5 files changed, 1 insertions, 17 deletions
diff --git a/config.h.in b/config.h.in
index ad6e3d022c..e1f98cdac4 100644
--- a/config.h.in
+++ b/config.h.in
@@ -36,11 +36,5 @@
#ifndef GR_RPCSERVER_THRIFT
#cmakedefine GR_RPCSERVER_THRIFT
#endif
-#ifndef ENABLE_GR_LOG
-#cmakedefine ENABLE_GR_LOG
-#endif
-#ifndef HAVE_LOG4CPP
-#cmakedefine HAVE_LOG4CPP
-#endif
#endif /* GNURADIO_CONFIG_H */
diff --git a/docs/doxygen/other/logger.dox b/docs/doxygen/other/logger.dox
index ae6a744d00..6501195750 100644
--- a/docs/doxygen/other/logger.dox
+++ b/docs/doxygen/other/logger.dox
@@ -17,12 +17,6 @@ from log4cpp (http://log4cpp.sourceforge.net/) which is readily
available in most Linux distributions. This is an optional dependency
and GNU Radio will work without it.
-When configuring GNU Radio, the -DENABLE_GR_LOG=On|Off option to cmake
-will allow the user to toggle use of the logger on and off. The logger
-defaults to "on" and will use log4cpp if it is available. If log4cpp
-is not found, the default logging will output to standard output or
-standard error, depending on the level of the log message.
-
Logging is useful for blocks to print out certain amounts of data at
different levels. These levels are:
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)
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