diff options
26 files changed, 10 insertions, 74 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index 8ff2793275..7d1d76ca54 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -180,9 +180,6 @@ macro(GR_SWIG_MAKE name) #setup the swig flags with flags and include directories set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -module ${name} ${GR_SWIG_FLAGS}) - foreach(dir ${GR_SWIG_INCLUDE_DIRS}) - list(APPEND CMAKE_SWIG_FLAGS "-I${dir}") - endforeach(dir) #set the C++ property on the swig .i file so it builds set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON) diff --git a/cmake/Modules/UseSWIG.cmake b/cmake/Modules/UseSWIG.cmake index b7e3e05dc5..e55543532f 100644 --- a/cmake/Modules/UseSWIG.cmake +++ b/cmake/Modules/UseSWIG.cmake @@ -155,6 +155,7 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile) endif(HAVE_WNO_UNUSED_BUT_SET_VARIABLE) get_directory_property(cmake_include_directories INCLUDE_DIRECTORIES) + list(REMOVE_DUPLICATES cmake_include_directories) set(swig_include_dirs) foreach(it ${cmake_include_directories}) set(swig_include_dirs ${swig_include_dirs} "-I${it}") diff --git a/gnuradio-runtime/CMakeLists.txt b/gnuradio-runtime/CMakeLists.txt index 17fc61e393..961647f5f7 100644 --- a/gnuradio-runtime/CMakeLists.txt +++ b/gnuradio-runtime/CMakeLists.txt @@ -43,6 +43,7 @@ GR_SET_GLOBAL(GNURADIO_RUNTIME_INCLUDE_DIRS ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/gnuradio-runtime/include ${CMAKE_BINARY_DIR}/gnuradio-runtime/include + ${LOG4CPP_INCLUDE_DIRS} ) GR_SET_GLOBAL(GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS @@ -137,11 +138,9 @@ endif(ENABLE_GR_LOG AND HAVE_LOG4CPP) add_subdirectory(include) add_subdirectory(lib) add_subdirectory(apps) -#add_subdirectory(doc) if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python) -# add_subdirectory(grc) add_subdirectory(examples) endif(ENABLE_PYTHON) diff --git a/gnuradio-runtime/lib/CMakeLists.txt b/gnuradio-runtime/lib/CMakeLists.txt index 3da550d37b..1180ebec72 100644 --- a/gnuradio-runtime/lib/CMakeLists.txt +++ b/gnuradio-runtime/lib/CMakeLists.txt @@ -44,11 +44,6 @@ configure_file( list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc) ######################################################################## -# Include subdirs rather to populate to the sources lists. -######################################################################## -#GR_INCLUDE_SUBDIRECTORY(foo) - -######################################################################## # Setup the include and linker paths ######################################################################## include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS} diff --git a/gnuradio-runtime/swig/CMakeLists.txt b/gnuradio-runtime/swig/CMakeLists.txt index ca9ddd4039..3236bcee61 100644 --- a/gnuradio-runtime/swig/CMakeLists.txt +++ b/gnuradio-runtime/swig/CMakeLists.txt @@ -27,7 +27,6 @@ set(GR_SWIG_INCLUDE_DIRS ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} - ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) diff --git a/gr-analog/CMakeLists.txt b/gr-analog/CMakeLists.txt index e0be42a0a5..111f42c4ed 100644 --- a/gr-analog/CMakeLists.txt +++ b/gr-analog/CMakeLists.txt @@ -30,6 +30,7 @@ GR_REGISTER_COMPONENT("gr-analog" ENABLE_GR_ANALOG Boost_FOUND ENABLE_VOLK ENABLE_GNURADIO_RUNTIME + ENABLE_GR_BLOCKS ENABLE_GR_FFT ENABLE_GR_FILTER ) diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt index 944b1599b1..df510ef9c9 100644 --- a/gr-audio/lib/CMakeLists.txt +++ b/gr-audio/lib/CMakeLists.txt @@ -26,14 +26,12 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${GR_AUDIO_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) link_directories(${Boost_LIBRARY_DIRS}) -link_directories(${LOG4CPP_LIBRARY_DIRS}) -list(APPEND gr_audio_libs gnuradio-runtime ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES}) +list(APPEND gr_audio_libs gnuradio-runtime ${Boost_LIBRARIES}) list(APPEND gr_audio_sources audio_registry.cc) list(APPEND gr_audio_confs ${CMAKE_CURRENT_SOURCE_DIR}/gr-audio.conf) diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt index 685f5736fb..539592419a 100644 --- a/gr-blocks/CMakeLists.txt +++ b/gr-blocks/CMakeLists.txt @@ -28,6 +28,7 @@ include(GrBoost) include(GrComponent) GR_REGISTER_COMPONENT("gr-blocks" ENABLE_GR_BLOCKS Boost_FOUND + ENABLE_VOLK ENABLE_GNURADIO_RUNTIME ) @@ -36,6 +37,7 @@ GR_SET_GLOBAL(GR_BLOCKS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR}/include + ${VOLK_INCLUDE_DIRS} ) ######################################################################## diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 1d69f27a1d..cc420002d1 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -65,7 +65,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../include ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${VOLK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) @@ -251,8 +250,6 @@ list(APPEND blocks_libs gnuradio-runtime ${VOLK_LIBRARIES} ${Boost_LIBRARIES} - ${BLOCKS_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) add_library(gnuradio-blocks SHARED ${gr_blocks_sources}) @@ -329,7 +326,6 @@ if(ENABLE_TESTING) gnuradio-blocks ${Boost_LIBRARIES} ${CPPUNIT_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) GR_ADD_TEST(test_gr_blocks test-gr-blocks) diff --git a/gr-blocks/tests/CMakeLists.txt b/gr-blocks/tests/CMakeLists.txt index 8f2b28edfa..f6b2b50050 100644 --- a/gr-blocks/tests/CMakeLists.txt +++ b/gr-blocks/tests/CMakeLists.txt @@ -36,9 +36,6 @@ link_directories( ${CPPUNIT_LIBRARY_DIRS} ) -include_directories(${LOG4CPP_INCLUDE_DIRS}) -link_directories(${LOG4CPP_LIBRARY_DIRS}) - ######################################################################## # Build benchmarks and non-registered tests ######################################################################## @@ -50,6 +47,5 @@ set(tests_not_run #single source per test foreach(test_not_run_src ${tests_not_run}) get_filename_component(name ${test_not_run_src} NAME_WE) add_executable(${name} ${test_not_run_src}) - target_link_libraries(${name} test-gnuradio-runtime gnuradio-blocks ${LOG4CPP_LIBRARIES}) + target_link_libraries(${name} test-gnuradio-runtime gnuradio-blocks) endforeach(test_not_run_src) - diff --git a/gr-comedi/lib/CMakeLists.txt b/gr-comedi/lib/CMakeLists.txt index e6e58dc8c4..105ba0a875 100644 --- a/gr-comedi/lib/CMakeLists.txt +++ b/gr-comedi/lib/CMakeLists.txt @@ -23,13 +23,11 @@ include_directories( ${GR_COMEDI_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${COMEDI_INCLUDE_DIRS} ) link_directories( - ${LOG4CXX_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ${COMEDI_LIBRARY_DIRS} ) diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt index c6fa0798d1..5edf96e8d5 100644 --- a/gr-digital/CMakeLists.txt +++ b/gr-digital/CMakeLists.txt @@ -34,8 +34,6 @@ GR_REGISTER_COMPONENT("gr-digital" ENABLE_GR_DIGITAL ENABLE_GR_FILTER ENABLE_GR_BLOCKS ENABLE_GR_ANALOG - ENABLE_GR_BLOCKS - ENABLE_GR_FILTER ) GR_SET_GLOBAL(GR_DIGITAL_INCLUDE_DIRS diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index 84f53ec4f3..4d573669be 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -29,12 +29,10 @@ include_directories( ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS} - ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) link_directories(${Boost_LIBRARY_DIRS}) -link_directories(${LOG4CPP_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) @@ -151,7 +149,6 @@ list(APPEND digital_libs gnuradio-analog ${VOLK_LIBRARIES} ${Boost_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) add_library(gnuradio-digital SHARED ${digital_sources}) @@ -228,7 +225,6 @@ if(ENABLE_TESTING) gnuradio-digital ${Boost_LIBRARIES} ${CPPUNIT_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) GR_ADD_TEST(test_gr_digital test-gr-digital) diff --git a/gr-dtv/CMakeLists.txt b/gr-dtv/CMakeLists.txt index b57429dea7..9cca0b0f5c 100644 --- a/gr-dtv/CMakeLists.txt +++ b/gr-dtv/CMakeLists.txt @@ -36,6 +36,7 @@ GR_REGISTER_COMPONENT("gr-dtv" ENABLE_GR_DTV ENABLE_GR_ANALOG ENABLE_GR_FILTER ENABLE_GR_FEC + ENABLE_VOLK ) GR_SET_GLOBAL(GR_DTV_INCLUDE_DIRS diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt index 4aa6d49d6d..18043fd8a0 100644 --- a/gr-dtv/lib/CMakeLists.txt +++ b/gr-dtv/lib/CMakeLists.txt @@ -100,11 +100,6 @@ list(APPEND dtv_sources catv/catv_trellis_enc_bb_impl.cc ) -if(ENABLE_GR_CTRLPORT) -list(APPEND dtv_sources -) -endif(ENABLE_GR_CTRLPORT) - list(APPEND dtv_libs gnuradio-runtime gnuradio-analog diff --git a/gr-fec/lib/CMakeLists.txt b/gr-fec/lib/CMakeLists.txt index bda98016b0..8fb802a9ec 100644 --- a/gr-fec/lib/CMakeLists.txt +++ b/gr-fec/lib/CMakeLists.txt @@ -32,7 +32,6 @@ include_directories( ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS} - ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) @@ -42,7 +41,6 @@ endif(ENABLE_GR_CTRLPORT) link_directories( ${Boost_LIBRARY_DIRS} - ${LOG4CPP_LIBRARY_DIRS} ) ######################################################################## @@ -87,8 +85,8 @@ list(APPEND gnuradio_fec_sources polar_decoder_sc_list.cc polar_decoder_common.cc scl_list.cc - polar_encoder_systematic.cc - polar_decoder_sc_systematic.cc + polar_encoder_systematic.cc + polar_decoder_sc_systematic.cc ) #Add Windows DLL resource file if using MSVC @@ -110,7 +108,6 @@ list(APPEND gnuradio_fec_libs gnuradio-runtime ${VOLK_LIBRARIES} ${Boost_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) # Only include the LDPC work if we have GSL installed diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index 586abe56af..c0c4ae1115 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -91,7 +91,6 @@ if(ENABLE_PYTHON) add_subdirectory(python/fft) add_subdirectory(grc) endif(ENABLE_PYTHON) -#add_subdirectory(examples) add_subdirectory(doc) ######################################################################## diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index feabe73be7..6847029e35 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -37,13 +37,11 @@ include_directories( ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS} - ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) link_directories( ${Boost_LIBRARY_DIRS} - ${LOG4CPP_LIBRARY_DIRS} ) if(ENABLE_GR_CTRLPORT) diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt index b1ee580398..553f27c58b 100644 --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -129,7 +129,6 @@ include_directories( ${QWT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} - ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ) @@ -137,7 +136,6 @@ include_directories( link_directories( ${QWT_LIBRARY_DIRS} ${FFTW3F_LIBRARY_DIRS} - ${LOG4CPP_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ) @@ -158,7 +156,6 @@ list(APPEND qtgui_libs ${QWT_LIBRARIES} ${QT_LIBRARIES} ${FFTW3F_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) if (WIN32) list(APPEND qtgui_libs diff --git a/gr-trellis/lib/CMakeLists.txt b/gr-trellis/lib/CMakeLists.txt index 9c51d06604..a5b3cf019c 100644 --- a/gr-trellis/lib/CMakeLists.txt +++ b/gr-trellis/lib/CMakeLists.txt @@ -25,12 +25,10 @@ include_directories( ${GR_TRELLIS_INCLUDE_DIRS} ${GR_DIGITAL_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) link_directories(${Boost_LIBRARY_DIRS}) -link_directories(${LOG4CXX_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt index be77e22556..c6622566f1 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -25,13 +25,11 @@ include_directories( ${GR_UHD_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${UHD_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) link_directories( ${UHD_LIBRARY_DIRS} - ${LOG4CXX_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ) @@ -39,9 +37,6 @@ if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) -include_directories(${LOG4CPP_INCLUDE_DIRS}) -link_directories(${LOG4CPP_LIBRARY_DIRS}) - ######################################################################## # Setup library ######################################################################## @@ -70,7 +65,6 @@ list(APPEND uhd_libs gnuradio-runtime ${Boost_LIBRARIES} ${UHD_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) add_library(gnuradio-uhd SHARED ${gr_uhd_sources}) diff --git a/gr-video-sdl/lib/CMakeLists.txt b/gr-video-sdl/lib/CMakeLists.txt index 42ad24e3ff..8c80dcfd83 100644 --- a/gr-video-sdl/lib/CMakeLists.txt +++ b/gr-video-sdl/lib/CMakeLists.txt @@ -23,12 +23,10 @@ include_directories( ${GR_VIDEO_SDL_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${SDL_INCLUDE_DIR} ) -link_directories(${LOG4CXX_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt index a347cbf7fe..5617d5ffef 100644 --- a/gr-vocoder/lib/CMakeLists.txt +++ b/gr-vocoder/lib/CMakeLists.txt @@ -152,20 +152,15 @@ mark_as_advanced(LIBCODEC2_INCLUDE_DIR LIBCODEC2_LIBRARIES) include_directories( ${GR_VOCODER_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) -link_directories(${LOG4CXX_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) -include_directories(${LOG4CPP_INCLUDE_DIRS}) -link_directories(${LOG4CPP_LIBRARY_DIRS}) - ######################################################################## # Setup library ######################################################################## @@ -219,7 +214,6 @@ endif(GR_USE_LOCAL_LIBGSM) list(APPEND vocoder_libs gnuradio-runtime ${Boost_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) if(GR_USE_SYSTEM_LIBCODEC2) diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt index bdc19a1ebc..716ef77dad 100644 --- a/gr-wavelet/CMakeLists.txt +++ b/gr-wavelet/CMakeLists.txt @@ -89,10 +89,7 @@ add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) add_subdirectory(python/wavelet) -# add_subdirectory(grc) endif(ENABLE_PYTHON) -#add_subdirectory(examples) -#add_subdirectory(doc) ######################################################################## # Create Pkg Config File diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index be2a7a8471..ffeb99e0ab 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -26,14 +26,11 @@ include_directories( ${GR_WAVELET_INCLUDE_DIRS} ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ) -# is this correct? link_directories(${GR_WAVELET_LIBRARY_DIRS}) -link_directories(${LOG4CXX_LIBRARY_DIRS}) link_directories(${Boost_LIBRARY_DIRS}) link_directories(${GSL_LIBRARY_DIRS}) add_definitions(${GSL_DEFINITIONS}) @@ -42,9 +39,6 @@ if(ENABLE_GR_CTRLPORT) ADD_DEFINITIONS(-DGR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) -include_directories(${LOG4CPP_INCLUDE_DIRS}) -link_directories(${LOG4CPP_LIBRARY_DIRS}) - ######################################################################## # Setup library ######################################################################## @@ -74,7 +68,6 @@ list(APPEND wavelet_libs ${Boost_LIBRARIES} ${WAVELET_LIBRARIES} ${GSL_LIBRARIES} - ${LOG4CPP_LIBRARIES} ) add_library(gnuradio-wavelet SHARED ${gr_wavelet_sources}) diff --git a/gr-wxgui/lib/CMakeLists.txt b/gr-wxgui/lib/CMakeLists.txt index d4c244177f..fcf4347cd7 100644 --- a/gr-wxgui/lib/CMakeLists.txt +++ b/gr-wxgui/lib/CMakeLists.txt @@ -64,7 +64,6 @@ list(APPEND wxgui_libs gnuradio-runtime ${VOLK_LIBRARIES} ${Boost_LIBRARIES} - ${BLOCKS_LIBRARIES} ${LOG4CPP_LIBRARIES} ) |