CMake improvements and compiler warning fixes

host/CMakeLists.txt

@@ -24,23 +24,26 @@ if(NOT CMAKE_BUILD_TYPE)
 endif(NOT CMAKE_BUILD_TYPE)
 set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "")
 
-#force UHD_RELEASE_MODE to be a string for cmake-gui
+# Force UHD_RELEASE_MODE to be a string for cmake-gui
 set(UHD_RELEASE_MODE "${UHD_RELEASE_MODE}" CACHE STRING "UHD Release Mode")
 
+
 ########################################################################
 # Project setup
 ########################################################################
 project(UHD 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 ${UHD_SOURCE_DIR}/cmake/Modules)
 
+
 ########################################################################
 # UHD Dependency Minimum Versions are stored in a separate file
 ########################################################################
 include(UHDMinDepVersions)
 
+
 ########################################################################
 # Check Compiler Version
 ########################################################################
@@ -67,21 +70,22 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
         RESULT_VARIABLE res ERROR_VARIABLE err
         ERROR_STRIP_TRAILING_WHITESPACE)
     if(${res} STREQUAL "0")
-        # output is in error stream
+        # Version output is in error stream
         string(REGEX MATCH "^Apple.*" IS_APPLE ${err})
+
+        # Retrieve the compiler's version
         if("${IS_APPLE}" STREQUAL "")
             set(MIN_VERSION ${UHD_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 ${UHD_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 UHD "
@@ -114,21 +118,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "C
     set(CMAKE_CXX_FLAGS "-stdlib=libc++ ${CMAKE_CXX_FLAGS}")
 endif()
 
+
 ########################################################################
 # Packaging Variables
 ########################################################################
-
 option(UNDERSCORE_UHD_VERSION "Replace dashes in uhd version with underscores" OFF)
 set(LIBUHD_PKG ${LIBUHD_PKG} CACHE BOOL "Build Debian libuhd003 package")
 set(LIBUHDDEV_PKG ${LIBUHDDEV_PKG} CACHE BOOL "Build Debian libuhd-dev package")
 set(UHDHOST_PKG ${UHDPOST_PKG} CACHE BOOL "Build Debian uhd-host package")
 include(UHDComponent) #enable components
 include(UHDPackage)   #setup cpack
 
+
 ########################################################################
 # Install Dirs
 ########################################################################
-#when the library suffix should be 64 (applies to redhat linux family)
+# Whether the library suffix should be 64 (applies to redhat linux family)
 if(NOT DEFINED LIB_SUFFIX AND REDHAT AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$")
     set(LIB_SUFFIX 64)
 endif()
@@ -149,6 +154,7 @@ if(NOT DEFINED PKG_DOC_DIR)
 endif()
 set(PKG_MAN_DIR share/man/man1)
 
+
 ########################################################################
 # UHD config files
 ########################################################################
@@ -173,6 +179,7 @@ else()
     message(WARNING "Not setting UHD_SYS_CONF_FILE!")
 endif()
 
+
 ########################################################################
 # UHD Image Directories
 ########################################################################
@@ -191,12 +198,14 @@ if(DEFINED UHD_IMAGES_DIR_WINREG_KEY)
     add_definitions(-DUHD_IMAGES_DIR_WINREG_KEY=${UHD_IMAGES_DIR_WINREG_KEY})
 endif(DEFINED UHD_IMAGES_DIR_WINREG_KEY)
 
+
 ########################################################################
 # Local Include Dir
 ########################################################################
 include_directories(${UHD_BINARY_DIR}/include)
 include_directories(${UHD_SOURCE_DIR}/include)
 
+
 ########################################################################
 # Static Lib Configuration
 ########################################################################
@@ -205,8 +214,9 @@ if(ENABLE_STATIC_LIBS)
     message(STATUS "Building Static Libraries: ${ENABLE_STATIC_LIBS}")
 endif(ENABLE_STATIC_LIBS)
 
+
 ########################################################################
-# On Apple only, set install name and use rpath correctly, if not already set
+# On Apple only, set install name and rpath correctly if not already set
 ########################################################################
 if(APPLE)
     if(NOT CMAKE_INSTALL_NAME_DIR)
@@ -222,9 +232,12 @@ if(APPLE)
     if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
         set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE
             BOOL "Do Build Using Library Install RPath" FORCE)
+        set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON CACHE
+            BOOL "Set install name to install name dir during build" FORCE)
     endif(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
 endif(APPLE)
 
+
 ########################################################################
 # Optional Compiler Flags
 ########################################################################
@@ -250,21 +263,23 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR
     #add_definitions(-pedantic)
     #add_definitions(-ansi)
     if(NOT WIN32)
-        #only export symbols that are declared to be part of the uhd api (non dll platforms)
+        # Only export symbols that are declared to be part of the uhd api (non dll platforms)
         UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN)
         UHD_ADD_OPTIONAL_CXX_COMPILER_FLAG(-fvisibility-inlines-hidden HAVE_VISIBILITY_INLINES_HIDDEN)
     endif(NOT WIN32)
     if(${CMAKE_BUILD_TYPE} STREQUAL "Coverage")
         include(CodeCoverage)
-        setup_target_for_coverage(coverage "ctest || return 0" coverage) # never fail ctest, always generate coverage report
+        # Never fail ctest, always generate coverage report
+        setup_target_for_coverage(coverage "ctest || return 0" coverage)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage" CACHE STRING "Flags used by the C++ compiler during Coverage builds." FORCE)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -pthread -g -O0 -fprofile-arcs -ftest-coverage" CACHE STRING "Flags used by the C compiler during Coverage builds." FORCE)
     endif()
 endif()
 
 if(MSVC)
     include_directories(${UHD_SOURCE_DIR}/cmake/msvc)
-    add_definitions( #stop all kinds of compatibility warnings
+    # Stop all kinds of compatibility warnings
+    add_definitions(
         -DWIN32_LEAN_AND_MEAN
         -DVC_EXTRALEAN
         -D_SCL_SECURE_NO_WARNINGS
@@ -275,19 +290,20 @@ if(MSVC)
         -D_CRT_NONSTDC_NO_DEPRECATE
         -D_WINSOCK_DEPRECATED_NO_WARNINGS
     )
-    # multi-threaded build and increases the number of addressable sections in an .obj file.
+    # Enable multi-threaded build and increase the number of addressable sections in an .obj file.
     add_compile_options(/MP /bigobj)
 endif(MSVC)
 
 if(CYGWIN)
-    add_definitions(-D__USE_W32_SOCKETS) #boost asio says we need this
+    add_definitions(-D__USE_W32_SOCKETS) # boost asio says we need this
 endif(CYGWIN)
 
 if(WIN32)
-    add_definitions(-D_WIN32_WINNT=0x0501) #minimum version required is windows xp
-    add_definitions(-DNOMINMAX) #disables stupidity and enables std::min and std::max
+    add_definitions(-D_WIN32_WINNT=0x0501) # minimum version required is windows xp
+    add_definitions(-DNOMINMAX) # disables stupidity and enables std::min and std::max
 endif(WIN32)
 
+
 ########################################################################
 # Setup Boost
 ########################################################################
@@ -308,15 +324,18 @@ set(UHD_BOOST_REQUIRED_COMPONENTS
 
 include(UHDBoost)
 
-include_directories(${Boost_INCLUDE_DIRS})
+# Include boost headers as system headers to avoid compiler warnings from them.
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})
 
+
 ########################################################################
 # Additional settings for build environment
 ########################################################################
 include(UHDGlobalDefs)
 include(UHDLog)
 
+
 ########################################################################
 # Check Python Modules
 ########################################################################
@@ -362,6 +381,7 @@ UHD_PYTHON_CHECK_MODULE_VERSION(
     HAVE_PYTHON_MODULE_YAML
 )
 
+
 ########################################################################
 # Option to use QEMU for running unittests
 #
@@ -415,6 +435,7 @@ if(ENABLE_QEMU_UNITTESTS)
     message(STATUS "  QEMU sysroot: ${QEMU_SYSROOT}")
 endif(ENABLE_QEMU_UNITTESTS)
 
+
 ########################################################################
 # Create Uninstall Target
 ########################################################################
@@ -427,6 +448,7 @@ add_custom_target(uninstall
     ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
 )
 
+
 ########################################################################
 # Install Package Docs
 ########################################################################
@@ -437,6 +459,7 @@ UHD_INSTALL(FILES
     COMPONENT readme
 )
 
+
 ########################################################################
 # Register top level components
 ########################################################################
@@ -478,6 +501,8 @@ if(WIN32)
 else()
     unset(ENABLE_EXTEND_WIN_PACKAGING CACHE)
 endif(WIN32)
+
+
 ########################################################################
 # Add the subdirectories
 ########################################################################
@@ -505,6 +530,7 @@ if(ENABLE_PYTHON_API OR ENABLE_PYMOD_UTILS)
     add_subdirectory(python)
 endif()
 
+
 ########################################################################
 # Create Pkg Config File
 ########################################################################
@@ -516,12 +542,12 @@ foreach(lib ${Boost_LIBRARY_DIRS})
     list(APPEND UHD_PC_LIBS "-L${lib}")
 endforeach(lib)
 
-#use space-separation format for the pc file
+# Use space-separation format for the pc file
 string(REPLACE ";" " " UHD_PC_REQUIRES "${UHD_PC_REQUIRES}")
 string(REPLACE ";" " " UHD_PC_CFLAGS "${UHD_PC_CFLAGS}")
 string(REPLACE ";" " " UHD_PC_LIBS "${UHD_PC_LIBS}")
 
-#unset these vars to avoid hard-coded paths to cross environment
+# Unset these vars to avoid hard-coded paths to cross environment
 if(CMAKE_CROSSCOMPILING)
     set(UHD_PC_CFLAGS)
     set(UHD_PC_LIBS)
@@ -583,6 +609,7 @@ UHD_INSTALL(
     COMPONENT "devel"
 )
 
+
 ########################################################################
 # Handle pre-built UHD Images for packaging
 ########################################################################
@@ -596,6 +623,7 @@ if(DEFINED UHD_IMAGES_SRC_DIR AND EXISTS "${UHD_IMAGES_SRC_DIR}")
     UHD_INSTALL(FILES ${_image_files} DESTINATION ${PKG_DATA_DIR}/images COMPONENT images)
 endif(DEFINED UHD_IMAGES_SRC_DIR AND EXISTS "${UHD_IMAGES_SRC_DIR}")
 
+
 ########################################################################
 # Handle pre-built UHD functional dependencies specific to Windows for
 # packaging

host/cmake/Modules/FindDPDK.cmake

@@ -19,5 +19,24 @@ include(FindPackageHandleStandardArgs)
 find_package(PkgConfig)
 PKG_CHECK_MODULES(DPDK libdpdk>=18.11)
 
-find_package_handle_standard_args(DPDK DEFAULT_MSG DPDK_INCLUDE_DIRS DPDK_CFLAGS DPDK_LDFLAGS DPDK_LIBRARIES)
+if(CMAKE_VERSION VERSION_LESS 3.19)
+    find_package_handle_standard_args(
+        DPDK
+        DEFAULT_MSG
+        DPDK_INCLUDE_DIRS
+        DPDK_CFLAGS DPDK_LDFLAGS
+        DPDK_LIBRARIES
+    )
+else()
+    find_package_handle_standard_args(
+        DPDK
+        REQUIRED_VARS
+            DPDK_INCLUDE_DIRS
+            DPDK_CFLAGS DPDK_LDFLAGS
+            DPDK_LIBRARIES
+        FAIL_MESSAGE "DPDK not found or misconfigured"
+        HANDLE_VERSION_RANGE
+    )
+endif()
+
 mark_as_advanced(DPDK_INCLUDE_DIRS DPDK_CFLAGS DPDK_LDFLAGS DPDK_LIBRARIES)

host/cmake/Modules/UHDBoost.cmake

@@ -186,11 +186,19 @@ if(${UHD_BOOST_OPTIONAL_COMPONENTS_LEN} GREATER 0)
 endif()
 
 if(${UHD_BOOST_REQUIRED_COMPONENTS_LEN} GREATER 0)
+    # With removal of FindBoost, default to automatically searching
+    # the upstream BoostConfig.cmake.
+    if(POLICY CMP0167)
+        cmake_policy(SET CMP0167 NEW)
+    endif(POLICY CMP0167)
+
     message(STATUS "  Looking for required Boost components...")
     find_package(Boost ${UHD_BOOST_MIN_VERSION} QUIET
         COMPONENTS ${UHD_BOOST_REQUIRED_COMPONENTS} ${UHD_BOOST_REQUIRED})
 endif()
 
+
+
 # restore BUILD_SHARED_LIBS, if set
 if(BUILD_SHARED_LIBS_SET)
     set(BUILD_SHARED_LIBS ${OLD_BUILD_SHARED_LIBS})

host/cmake/Modules/UHDConfig.cmake.in

@@ -21,13 +21,11 @@
 # Allows us to use all .cmake files in this directory
 list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}")
 
-# set that this file was found, for use in GNU Radio's FindUHD.cmake.
+# Set that this file was found, for use in GNU Radio's FindUHD.cmake.
 # Have to use the ENV, since this file might not allow CACHE changes.
-
 set(ENV{UHD_CONFIG_USED} TRUE)
 
-# set default values
-
+# Set default values
 set(UHD_FOUND TRUE)
 set(UHD_RFNOC_FOUND @UHD_RFNOC_FOUND@)
 set(UHD_INCLUDE_HINTS)
@@ -69,7 +67,6 @@ endif()
 # Verify that <uhd/config.hpp> and libuhd are available, and, if a
 # version is provided, that UHD meets the version requirements -- no
 # matter what pkg-config might think.
-
 find_path(
     UHD_INCLUDE_DIRS
     NAMES uhd/config.hpp
@@ -104,13 +101,9 @@ if(UHD_USE_STATIC_LIBS)
 endif(UHD_USE_STATIC_LIBS)
 
 if(UHD_LIBRARIES AND UHD_INCLUDE_DIRS)
-
   include(FindPackageHandleStandardArgs)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(UHD DEFAULT_MSG UHD_LIBRARIES UHD_INCLUDE_DIRS)
   mark_as_advanced(UHD_LIBRARIES UHD_INCLUDE_DIRS)
-
 elseif(UHD_FIND_REQUIRED)
-
   message(FATAL_ERROR "UHD is required, but was not found.")
-
 endif()

host/include/uhd/rfnoc/chdr_types.hpp

@@ -709,7 +709,10 @@ class UHD_API mgmt_op_t
         : _op_code(op_code), _op_payload(op_payload), _ops_pending(ops_pending)
     {
     }
+
     mgmt_op_t(const mgmt_op_t& rhs) = default;
+    mgmt_op_t& operator=(const mgmt_op_t& rhs) = default;
+
 
     //! Get the ops pending for this transaction
     //  Note that ops_pending is not used by UHD, since it can infer this value