diff options
Diffstat (limited to 'gr-fec/lib')
| -rw-r--r-- | gr-fec/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-fec/lib/generic_decoder.cc | 8 | ||||
| -rw-r--r-- | gr-fec/lib/generic_encoder.cc | 8 | ||||
| -rw-r--r-- | gr-fec/lib/reed-solomon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-fec/lib/viterbi/CMakeLists.txt | 1 |
5 files changed, 4 insertions, 18 deletions
diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt index bda98016b0..7ed38404f3 100644 --- a/gr-fec/lib/CMakeLists.txt +++ b/gr-fec/lib/CMakeLists.txt @@ -131,7 +131,7 @@ endif(GSL_FOUND) add_library(gnuradio-fec SHARED ${gnuradio_fec_sources}) target_link_libraries(gnuradio-fec ${gnuradio_fec_libs}) -GR_LIBRARY_FOO(gnuradio-fec RUNTIME_COMPONENT "fec_runtime" DEVEL_COMPONENT "fec_devel") +GR_LIBRARY_FOO(gnuradio-fec) if(ENABLE_STATIC_LIBS) if(ENABLE_GR_CTRLPORT) @@ -153,6 +153,6 @@ if(ENABLE_STATIC_LIBS) endif(NOT WIN32) install(TARGETS gnuradio-fec_static - ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "fec_devel" # .lib file + ARCHIVE DESTINATION lib${LIB_SUFFIX} # .lib file ) endif(ENABLE_STATIC_LIBS) diff --git a/gr-fec/lib/generic_decoder.cc b/gr-fec/lib/generic_decoder.cc index aa11aa8d5e..62d4d2a581 100644 --- a/gr-fec/lib/generic_decoder.cc +++ b/gr-fec/lib/generic_decoder.cc @@ -36,8 +36,6 @@ namespace gr { d_name = name; my_id = base_unique_id++; -#ifdef ENABLE_GR_LOG -#ifdef HAVE_LOG4CPP prefs *p = prefs::singleton(); std::string config_file = p->get_string("LOG", "log_config", ""); std::string log_level = p->get_string("LOG", "log_level", "off"); @@ -58,12 +56,8 @@ namespace gr { GR_LOG_SET_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n"); } } - d_logger = LOG; -#endif /* HAVE_LOG4CPP */ -#else /* ENABLE_GR_LOG */ - d_logger = NULL; -#endif /* ENABLE_GR_LOG */ + d_logger = LOG; } generic_decoder::~generic_decoder() diff --git a/gr-fec/lib/generic_encoder.cc b/gr-fec/lib/generic_encoder.cc index c5c7f04f55..7872f17068 100644 --- a/gr-fec/lib/generic_encoder.cc +++ b/gr-fec/lib/generic_encoder.cc @@ -36,8 +36,6 @@ namespace gr { d_name = name; my_id = base_unique_id++; -#ifdef ENABLE_GR_LOG -#ifdef HAVE_LOG4CPP prefs *p = prefs::singleton(); std::string config_file = p->get_string("LOG", "log_config", ""); std::string log_level = p->get_string("LOG", "log_level", "off"); @@ -58,12 +56,8 @@ namespace gr { GR_LOG_SET_FILE_APPENDER(LOG, log_file , true,"%r :%p: %c{1} - %m%n"); } } - d_logger = LOG; -#endif /* HAVE_LOG4CPP */ -#else /* ENABLE_GR_LOG */ - d_logger = NULL; -#endif /* ENABLE_GR_LOG */ + d_logger = LOG; } generic_encoder::~generic_encoder() diff --git a/gr-fec/lib/reed-solomon/CMakeLists.txt b/gr-fec/lib/reed-solomon/CMakeLists.txt index 0858a670c5..3d35c9025d 100644 --- a/gr-fec/lib/reed-solomon/CMakeLists.txt +++ b/gr-fec/lib/reed-solomon/CMakeLists.txt @@ -46,7 +46,6 @@ list(APPEND gnuradio_fec_sources ${gr_fec_rs_sources}) #install( # FILES ${CMAKE_CURRENT_SOURCE_DIR}/rs.h # DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec -# COMPONENT "fec_devel" #) ######################################################################## diff --git a/gr-fec/lib/viterbi/CMakeLists.txt b/gr-fec/lib/viterbi/CMakeLists.txt index 3697787bcc..10c5940246 100644 --- a/gr-fec/lib/viterbi/CMakeLists.txt +++ b/gr-fec/lib/viterbi/CMakeLists.txt @@ -51,7 +51,6 @@ list(APPEND gnuradio_fec_sources ${viterbi_sources}) #install( # FILES ${CMAKE_CURRENT_SOURCE_DIR}/viterbi.h # DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec -# COMPONENT "fec_devel" #) ######################################################################## |