diff options
31 files changed, 137 insertions, 128 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eab6d9bd52..47848155bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,16 +25,18 @@ endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) ######################################################################## # Project setup ######################################################################## +# Make sure this version matches ${GR_CMAKE_MIN_VERSION} (a variable can't be +# used here). cmake_minimum_required(VERSION 2.6) project(gnuradio CXX C) enable_testing() -#make sure our local CMake Modules path comes first +# Make sure our local CMake Modules path comes first list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) include(GrBuildTypes) -#select the release build type by default to get optimization flags +# Select the release build type by default to get optimization flags if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") message(STATUS "Build type not specified: defaulting to release.") @@ -50,41 +52,23 @@ set(VERSION_INFO_MINOR_VERSION 12) set(VERSION_INFO_MAINT_VERSION git) include(GrVersion) #setup version info -# Append -O2 optimization flag for Debug builds (Not on MSVC since conflicts with RTC1 flag) -IF (NOT MSVC) - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2") -ENDIF() +# Minimum dependency versions for central dependencies: +set(GR_BOOST_MIN_VERSION "1.48") +set(GR_SWIG_MIN_VERSION "2.0.3") +set(GR_CMAKE_MIN_VERSION "2.8.12") +set(GR_MAKO_MIN_VERSION "0.4.2") +set(GR_PYTHON_MIN_VERSION "2.7") +#set(GR_PYTHON3_MIN_VERSION "3.x") # Py3k not yet supported +set(GR_CPPUNIT_MIN_VERSION "1.12.1") +set(GCC_MIN_VERSION "4.4.0") +set(CLANG_MIN_VERSION "3.3.0") +set(APPLECLANG_MIN_VERSION "500") -# Set C/C++ standard for all targets -# NOTE: Starting with cmake v3.1 this should be used: -# set(CMAKE_C_STANDARD 90) -# set(CMAKE_CXX_STANDARD 98) - -IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") -ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") -ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") -ELSE() - message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.") -ENDIF() - -IF(CMAKE_C_COMPILER_ID STREQUAL "GNU") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") -ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") -ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") -ELSE() - message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.") -ENDIF() - -# Set cmake policies. +######################################################################## +# Configure CMake policies +######################################################################## # This will suppress developer warnings during the cmake process that can occur # if a newer cmake version than the minimum is used. - if(POLICY CMP0026) cmake_policy(SET CMP0026 OLD) endif() @@ -99,6 +83,81 @@ if(POLICY CMP0046) endif() ######################################################################## +# Compiler version setup +######################################################################## +# Append -O2 optimization flag for Debug builds (Not on MSVC since conflicts with RTC1 flag) +IF (NOT MSVC) + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2") + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2") +ENDIF() + +# Check compiler version against our minimum +IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + IF(DEFINED CMAKE_CXX_COMPILER_VERSION) + IF(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS ${GCC_MIN_VERSION}) + MESSAGE(WARNING "\nThe compiler selected to build GNU Radio (GCC version ${CMAKE_CXX_COMPILER_VERSION} : ${CMAKE_CXX_COMPILER}) is older than that officially supported (${GCC_MIN_VERSION} minimum). This build may or not work. We highly recommend using a more recent GCC version.") + ENDIF() + ELSE() + MESSAGE(WARNING "\nCannot determine the version of the compiler selected to build GNU Radio (GCC : ${CMAKE_CXX_COMPILER}). This build may or not work. We highly recommend using GCC version ${GCC_MIN_VERSION} or more recent.") + ENDIF() +ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + EXECUTE_PROCESS(COMMAND + ${CMAKE_CXX_COMPILER} -v + RESULT_VARIABLE _res ERROR_VARIABLE _err + ERROR_STRIP_TRAILING_WHITESPACE) + IF(${_res} STREQUAL "0") + # output is in error stream + STRING(REGEX MATCH "^Apple.*" IS_APPLE ${_err}) + IF("${IS_APPLE}" STREQUAL "") + SET(MIN_VERSION ${CLANG_MIN_VERSION}) + SET(APPLE_STR "") + # retrieve the compiler's version from it + STRING(REGEX MATCH "clang version [0-9.]+" CLANG_OTHER_VERSION ${_err}) + STRING(REGEX MATCH "[0-9.]+" CLANG_VERSION ${CLANG_OTHER_VERSION}) + ELSE() + SET(MIN_VERSION ${APPLECLANG_MIN_VERSION}) + SET(APPLE_STR "Apple ") + # retrieve the compiler's version from it + STRING(REGEX MATCH "(clang-[0-9.]+)" CLANG_APPLE_VERSION ${_err}) + STRING(REGEX MATCH "[0-9.]+" CLANG_VERSION ${CLANG_APPLE_VERSION}) + ENDIF() + IF(${CLANG_VERSION} VERSION_LESS "${MIN_VERSION}") + MESSAGE(WARNING "\nThe compiler selected to build GNU Radio (${APPLE_STR}Clang version ${CLANG_VERSION} : ${CMAKE_CXX_COMPILER}) is older than that officially supported (${MIN_VERSION} minimum). This build may or not work. We highly recommend using Apple Clang version ${APPLECLANG_MIN_VERSION} or more recent, or Clang version ${CLANG_MIN_VERSION} or more recent.") + ENDIF() + ELSE() + MESSAGE(WARNING "\nCannot determine the version of the compiler selected to build GNU Radio (${APPLE_STR}Clang : ${CMAKE_CXX_COMPILER}). This build may or not work. We highly recommend using Apple Clang version ${APPLECLANG_MIN_VERSION} or more recent, or Clang version ${CLANG_MIN_VERSION} or more recent.") + ENDIF() +ELSE() + MESSAGE(status "Skipping compiler version check.") +ENDIF() + +# Configure C++ and C standards +IF(CMAKE_VERSION VERSION_LESS "3.1") + IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") + ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") + ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98") + ELSE() + MESSAGE(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.") + ENDIF() + + IF(CMAKE_C_COMPILER_ID STREQUAL "GNU") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") + ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") + ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") + ELSE() + MESSAGE(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.") + ENDIF() +ELSE() + SET(CMAKE_C_STANDARD 90) + SET(CMAKE_CXX_STANDARD 98) +ENDIF() + +######################################################################## # Environment setup ######################################################################## IF(NOT DEFINED BOOST_ROOT) @@ -283,15 +342,12 @@ include(GrBoost) ######################################################################## # Enable python component ######################################################################## -find_package(PythonLibs 2) +find_package(PythonLibs ${GR_PYTHON_MIN_VERSION}) find_package(SWIG) if(SWIG_FOUND) - # Minimum SWIG version required is 2.0.4 - # Recommended revisit: EOL of Ubuntu 12.04 LTS, bump to 2.0.7 - # see https://github.com/gnuradio/gnuradio/issues/1222 set(SWIG_VERSION_CHECK FALSE) - if("${SWIG_VERSION}" VERSION_GREATER "2.0.3") + if("${SWIG_VERSION}" VERSION_GREATER ${GR_SWIG_MIN_VERSION}) set(SWIG_VERSION_CHECK TRUE) endif() endif(SWIG_FOUND) @@ -303,7 +359,7 @@ GR_REGISTER_COMPONENT("python-support" ENABLE_PYTHON SWIG_VERSION_CHECK ) -find_package(CppUnit) +find_package(CppUnit ${GR_CPPUNIT_MIN_VERSION}) GR_REGISTER_COMPONENT("testing-support" ENABLE_TESTING CPPUNIT_FOUND ) diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index 39a78c5b86..150009a7b9 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -68,15 +68,13 @@ if(MSVC) endif(BOOST_ALL_DYN_LINK) endif(MSVC) -find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) +find_package(Boost ${GR_BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) # This does not allow us to disable specific versions. It is used # internally by cmake to know the formation newer versions. As newer # Boost version beyond what is shown here are produced, we must extend # this list. To disable Boost versions, see below. set(Boost_ADDITIONAL_VERSIONS - "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39" - "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.49.0" "1.49" "1.50.0" "1.50" "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54" "1.55.0" "1.55" "1.56.0" "1.56" "1.57.0" "1.57" "1.58.0" "1.58" "1.59.0" "1.59" 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/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt index a837bd8e11..faa1fbc891 100644 --- a/docs/doxygen/CMakeLists.txt +++ b/docs/doxygen/CMakeLists.txt @@ -34,6 +34,10 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/other/build_guide.dox.in + ${CMAKE_CURRENT_BINARY_DIR}/other/build_guide.dox +@ONLY) set(BUILT_DIRS ${CMAKE_CURRENT_BINARY_DIR}/xml ${CMAKE_CURRENT_BINARY_DIR}/html) diff --git a/docs/doxygen/other/build_guide.dox b/docs/doxygen/other/build_guide.dox.in index f3bea608a4..68e54066e8 100644 --- a/docs/doxygen/other/build_guide.dox +++ b/docs/doxygen/other/build_guide.dox.in @@ -16,8 +16,8 @@ if any, to build the various GNU Radio components. Most of these components do not need to be individually compiled or installed. Instead, rely on your operating system's package manager or -binary installation process (the <b>apt-get</b> system in Debian and -Ubuntu, <b>yum</b> in RedHat and Fedora, etc.). GNU Radio tries to keep an +binary installation process (the <b>apt-get</b> or \b apt system in Debian and +Ubuntu, <b>yum</b> or \b dnf in RedHat and Fedora, etc.). GNU Radio tries to keep an up-to-date build guide for the majority of the supported operating systems on gnuradio.org (http://gnuradio.org/redmine/projects/gnuradio/wiki/BuildGuide). @@ -33,16 +33,24 @@ installation tool (apt-get, pkg_install, YaST, yum, urpmi, etc.) first. Most recent systems have these packages available. \subsection dep_global Global Dependencies -\li git http://git-scm.com/downloads -\li cmake (>= 2.6.3) http://www.cmake.org/cmake/resources/software.html -\li boost (>= 1.35) http://www.boost.org/users/download/ -\li cppunit (>= 1.9.14) http://freedesktop.org/wiki/Software/cppunit/ -\li fftw3f (>= 3.0.1) http://www.fftw.org/download.html + +\li git http://git-scm.com/downloads +\li cmake (>= @GR_CMAKE_MIN_VERSION@) http://www.cmake.org/cmake/resources/software.html +\li boost (>= @GR_BOOST_MIN_VERSION@) http://www.boost.org/users/download/ +\li cppunit (>= @GR_CPPUNIT_MIN_VERSION@) http://freedesktop.org/wiki/Software/cppunit/ +\li mako (>= @GR_MAKO_MIN_VERSION@) http://www.makotemplates.org/download.html + +A C/C++ compiler is also required. These are known to work: + +\li gcc/g++ (>= @GCC_MIN_VERSION@) https://gcc.gnu.org/install/download.html +\li clang/clang++ (>= @CLANG_MIN_VERSION@) http://releases.llvm.org/download.html + +Other compilers may work, but are not supported. \subsection dep_python Python Wrappers -\li python (>= 2.5) http://www.python.org/download/ -\li swig (>= 1.3.31) http://www.swig.org/download.html -\li numpy (>= 1.1.0) http://sourceforge.net/projects/numpy/files/NumPy/ +\li python (>= @GR_PYTHON_MIN_VERSION@) http://www.python.org/download/ +\li swig (>= @GR_SWIG_MIN_VERSION@) http://www.swig.org/download.html +\li numpy (>= 1.1.0) http://sourceforge.net/projects/numpy/files/NumPy/ \subsection dep_docs docs: Building the documentation \li doxygen (>= 1.5) http://www.stack.nl/~dimitri/doxygen/download.html @@ -52,6 +60,9 @@ first. Most recent systems have these packages available. \li Cheetah (>= 2.0) http://www.cheetahtemplate.org/ \li pygtk (>= 2.10) http://www.pygtk.org/downloads.html +\subsection dep_fft gr-fft: Fast Frequency Transform +\li fftw3f (>= 3.0.1) http://www.fftw.org/download.html + \subsection dep_wavelet gr-wavelet: Collection of wavelet blocks \li gsl (>= 1.10) http://gnuwin32.sourceforge.net/packages/gsl.htm @@ -79,7 +90,7 @@ one(s) that are right for your system. On Linux, don't expect audio-osx and audio-windows to be either satisfied or built. \subsection dep_uhd uhd: The Ettus USRP Hardware Driver Interface -\li uhd (>= 3.0.0) http://code.ettus.com/redmine/ettus/projects/uhd/wiki +\li uhd (>= 3.5.5) https://www.ettus.com/downloads \subsection dep_gr_video_sdl gr-video-sdl: PAL and NTSC display \li SDL (>= 1.2.0) http://www.libsdl.org/download-1.2.php 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 5a23482b26..be710b6028 100644 --- a/gr-dtv/CMakeLists.txt +++ b/gr-dtv/CMakeLists.txt @@ -33,6 +33,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-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index b82d0fdae9..2852447c80 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -105,6 +105,10 @@ temp -= what; return temp; } + bool __eq__(const uhd::time_spec_t &what) + { + return (what == *self); + } }; %include <uhd/types/stream_cmd.hpp> 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} ) |