[PATCH] Remove CMake and build noise.

Ron Economos w6rz at comcast.net
Thu Jan 28 16:26:19 UTC 2021


Sorry, there's a mistake. The hash in source_python.cc is incorrect.

Ron

On 1/28/21 07:55, Ron Economos wrote:
> Signed-off-by: Ron Economos <w6rz at comcast.net>
> ---
>   CMakeLists.txt                      |  3 ++-
>   cmake/Modules/FindLibAIRSPY.cmake   |  6 ++++--
>   cmake/Modules/FindLibAIRSPYHF.cmake |  6 ++++--
>   cmake/Modules/FindLibHackRF.cmake   |  6 ++++--
>   include/osmosdr/source.h            |  1 +
>   lib/CMakeLists.txt                  |  2 +-
>   lib/sink_iface.h                    |  1 +
>   lib/source_iface.h                  |  2 ++
>   python/bindings/python_bindings.cc  | 12 ++++++------
>   python/bindings/source_python.cc    |  2 +-
>   10 files changed, 26 insertions(+), 15 deletions(-)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index b4bb535..96a2c90 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -21,8 +21,8 @@
>   # Project setup
>   ########################################################################
>   cmake_minimum_required(VERSION 3.8)
> -include(GNUInstallDirs)
>   project(gr-osmosdr CXX C)
> +include(GNUInstallDirs)
>   enable_testing()
>   
>   #policy setup
> @@ -41,6 +41,7 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
>   list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
>   
>   # Find GNURadio (pmt and runtime are core, always included)
> +include(FindPkgConfig)
>   find_package(Gnuradio "3.9" REQUIRED COMPONENTS blocks fft filter)
>   
>   # Set the version information here
> diff --git a/cmake/Modules/FindLibAIRSPY.cmake b/cmake/Modules/FindLibAIRSPY.cmake
> index 221edcc..437adc4 100644
> --- a/cmake/Modules/FindLibAIRSPY.cmake
> +++ b/cmake/Modules/FindLibAIRSPY.cmake
> @@ -1,4 +1,6 @@
> -INCLUDE(FindPkgConfig)
> +if(NOT PKG_CONFIG_FOUND)
> +    INCLUDE(FindPkgConfig)
> +endif()
>   PKG_CHECK_MODULES(PC_LIBAIRSPY libairspy)
>   
>   FIND_PATH(
> @@ -20,5 +22,5 @@ FIND_LIBRARY(
>   )
>   
>   INCLUDE(FindPackageHandleStandardArgs)
> -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS)
> +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS)
>   MARK_AS_ADVANCED(LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS)
> diff --git a/cmake/Modules/FindLibAIRSPYHF.cmake b/cmake/Modules/FindLibAIRSPYHF.cmake
> index edb0dda..8c06128 100644
> --- a/cmake/Modules/FindLibAIRSPYHF.cmake
> +++ b/cmake/Modules/FindLibAIRSPYHF.cmake
> @@ -1,4 +1,6 @@
> -INCLUDE(FindPkgConfig)
> +if(NOT PKG_CONFIG_FOUND)
> +    INCLUDE(FindPkgConfig)
> +endif()
>   PKG_CHECK_MODULES(PC_LIBAIRSPYHF libairspyhf)
>   
>   FIND_PATH(
> @@ -20,5 +22,5 @@ FIND_LIBRARY(
>   )
>   
>   INCLUDE(FindPackageHandleStandardArgs)
> -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS)
> +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS)
>   MARK_AS_ADVANCED(LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS)
> diff --git a/cmake/Modules/FindLibHackRF.cmake b/cmake/Modules/FindLibHackRF.cmake
> index a0d57ef..bc2bc3e 100644
> --- a/cmake/Modules/FindLibHackRF.cmake
> +++ b/cmake/Modules/FindLibHackRF.cmake
> @@ -1,4 +1,6 @@
> -INCLUDE(FindPkgConfig)
> +if(NOT PKG_CONFIG_FOUND)
> +    INCLUDE(FindPkgConfig)
> +endif()
>   PKG_CHECK_MODULES(PC_LIBHACKRF libhackrf)
>   
>   FIND_PATH(
> @@ -20,6 +22,6 @@ FIND_LIBRARY(
>   )
>   
>   INCLUDE(FindPackageHandleStandardArgs)
> -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBHACKRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS)
> +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibHackRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS)
>   MARK_AS_ADVANCED(LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS)
>   
> diff --git a/include/osmosdr/source.h b/include/osmosdr/source.h
> index 3ea716d..20c77b1 100644
> --- a/include/osmosdr/source.h
> +++ b/include/osmosdr/source.h
> @@ -63,6 +63,7 @@ public:
>      *
>      * \param seek_point	sample offset in file
>      * \param whence	one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek)
> +   * \param chan	the channel index 0 to N-1
>      * \return true on success
>      */
>     virtual bool seek( long seek_point, int whence, size_t chan = 0 ) = 0;
> diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
> index 1bb8655..c7cfec3 100644
> --- a/lib/CMakeLists.txt
> +++ b/lib/CMakeLists.txt
> @@ -44,7 +44,7 @@ endif()
>   #this appends all unnamed implicit macro args!
>   MACRO (APPEND_LIB_LIST)
>         SET (gr_osmosdr_libs "${gr_osmosdr_libs};${ARGN}" CACHE INTERNAL "lib list")
> -ENDMACRO (APPEND_INTERNAL_LIST)
> +ENDMACRO (APPEND_LIB_LIST)
>   
>   set(gr_osmosdr_libs "" CACHE INTERNAL "lib that accumulates link targets")
>   
> diff --git a/lib/sink_iface.h b/lib/sink_iface.h
> index 39aabc7..15ea952 100644
> --- a/lib/sink_iface.h
> +++ b/lib/sink_iface.h
> @@ -201,6 +201,7 @@ public:
>   
>     /*!
>      * Select the active antenna of the underlying radio hardware.
> +   * \param antenna the antenna name
>      * \param chan the channel index 0 to N-1
>      * \return the actual antenna's name
>      */
> diff --git a/lib/source_iface.h b/lib/source_iface.h
> index abb70eb..14f05bb 100644
> --- a/lib/source_iface.h
> +++ b/lib/source_iface.h
> @@ -43,6 +43,7 @@ public:
>      *
>      * \param seek_point	sample offset in file
>      * \param whence	one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek)
> +   * \param chan	the channel index 0 to N-1
>      * \return true on success
>      */
>     virtual bool seek( long seek_point, int whence, size_t chan = 0 ) { return false; }
> @@ -210,6 +211,7 @@ public:
>   
>     /*!
>      * Select the active antenna of the underlying radio hardware.
> +   * \param antenna the antenna name
>      * \param chan the channel index 0 to N-1
>      * \return the actual antenna's name
>      */
> diff --git a/python/bindings/python_bindings.cc b/python/bindings/python_bindings.cc
> index 7204b2b..428417d 100644
> --- a/python/bindings/python_bindings.cc
> +++ b/python/bindings/python_bindings.cc
> @@ -16,9 +16,9 @@ namespace py = pybind11;
>   
>   // Headers for binding functions
>   /**************************************/
> -/* The following comment block is used for
> -/* gr_modtool to insert function prototypes
> -/* Please do not delete
> +// The following comment block is used for
> +// gr_modtool to insert function prototypes
> +// Please do not delete
>   /**************************************/
>   // BINDING_FUNCTION_PROTOTYPES(
>       void bind_sink(py::module& m);
> @@ -50,9 +50,9 @@ PYBIND11_MODULE(osmosdr_python, m)
>       py::module::import("gnuradio.gr");
>   
>       /**************************************/
> -    /* The following comment block is used for
> -    /* gr_modtool to insert binding function calls
> -    /* Please do not delete
> +    // The following comment block is used for
> +    // gr_modtool to insert binding function calls
> +    // Please do not delete
>       /**************************************/
>       // BINDING_FUNCTION_CALLS(
>           bind_sink(m);
> diff --git a/python/bindings/source_python.cc b/python/bindings/source_python.cc
> index 48bf10c..984ab8c 100644
> --- a/python/bindings/source_python.cc
> +++ b/python/bindings/source_python.cc
> @@ -14,7 +14,7 @@
>   /* BINDTOOL_GEN_AUTOMATIC(1)                                                       */
>   /* BINDTOOL_USE_PYGCCXML(0)                                                        */
>   /* BINDTOOL_HEADER_FILE(source.h)                                        */
> -/* BINDTOOL_HEADER_FILE_HASH(574373c3c7682569b0fd7eea577739da)                     */
> +/* BINDTOOL_HEADER_FILE_HASH(3e34b808713596a20401ddcccc7952d9)                     */
>   /***********************************************************************************/
>   
>   #include <pybind11/complex.h>


More information about the osmocom-sdr mailing list