diff options
| author | Luke Berndt <lukekb@gmail.com> | 2021-09-14 19:45:11 -0400 |
|---|---|---|
| committer | Luke Berndt <lukekb@gmail.com> | 2021-09-14 19:45:11 -0400 |
| commit | 1539ba7ad6759a72b1120b8a5598e24551704129 (patch) | |
| tree | feb2ac3fd6a35a944a7ed21c70c7a86b28862482 /cmake | |
| parent | 9abda2035ed6a721175b98a92f242fbd45168bad (diff) | |
Fixing some cmake issues with osmosdr
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindGnuradioOsmosdr.cmake | 18 | ||||
| -rw-r--r-- | cmake/Modules/FindLibOsmoSDR.cmake | 41 |
2 files changed, 16 insertions, 43 deletions
diff --git a/cmake/Modules/FindGnuradioOsmosdr.cmake b/cmake/Modules/FindGnuradioOsmosdr.cmake index ab2563d7..6817f724 100644 --- a/cmake/Modules/FindGnuradioOsmosdr.cmake +++ b/cmake/Modules/FindGnuradioOsmosdr.cmake @@ -1,19 +1,22 @@ -PKG_CHECK_MODULES(PC_GNURADIO_OSMOSDR gnuradio-osmosdr) +PKG_CHECK_MODULES(GNURADIO_OSMOSDR gnuradio-osmosdr) FIND_PATH( GNURADIO_OSMOSDR_INCLUDE_DIRS NAMES osmosdr/source.h HINTS $ENV{GNURADIO_OSMOSDR_DIR}/include ${PC_GNURADIO_OSMOSDR_INCLUDEDIR} + ${PC_GNURADIO_OSMOSDR_INCLUDE_DIRS} ${CMAKE_INSTALL_PREFIX}/include/osmosdr PATHS /usr/local/include/osmosdr /usr/include/osmosdr + /opt/local/include ) FIND_LIBRARY( GNURADIO_OSMOSDR_LIBRARIES NAMES gnuradio-osmosdr HINTS $ENV{GNURADIO_OSMOSDR_DIR}/lib + ${PC_GNURADIO_OSMOSDR_LIBRARY_DIRS} ${PC_GNURADIO_OSMOSDR_LIBDIR} ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/lib64 @@ -21,8 +24,19 @@ FIND_LIBRARY( /usr/local/lib64 /usr/lib /usr/lib64 + /opt/local/lib ) + +if(GNURADIO_OSMOSDR_INCLUDE_DIRS AND GNURADIO_OSMOSDR_LIBRARIES) + set(GNURADIO_OSMOSDR_FOUND TRUE CACHE INTERNAL "gnuradio-osmosdr found") + message(STATUS "Found gnuradio-osmosdr: ${GNURADIO_UHD_INCLUDE_DIRS}, ${GNURADIO_UHD_LIBRARIES}") +else(GNURADIO_OSMOSDR_INCLUDE_DIRS AND GNURADIO_OSMOSDR_LIBRARIES) + set(GNURADIO_OSMOSDR_FOUND FALSE CACHE INTERNAL "gnuradio-osmosdr found") + message(STATUS "gnuradio-osmosdr not found.") +endif(GNURADIO_OSMOSDR_INCLUDE_DIRS AND GNURADIO_OSMOSDR_LIBRARIES) + + INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuradioOsmosdr DEFAULT_MSG GNURADIO_OSMOSDR_LIBRARIES GNURADIO_OSMOSDR_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuradioOsmoSDR DEFAULT_MSG GNURADIO_OSMOSDR_LIBRARIES GNURADIO_OSMOSDR_INCLUDE_DIRS) MARK_AS_ADVANCED(GNURADIO_OSMOSDR_LIBRARIES GNURADIO_OSMOSDR_INCLUDE_DIRS)
\ No newline at end of file diff --git a/cmake/Modules/FindLibOsmoSDR.cmake b/cmake/Modules/FindLibOsmoSDR.cmake deleted file mode 100644 index 9d95e39f..00000000 --- a/cmake/Modules/FindLibOsmoSDR.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# Tries to find libosmosdr. -# -# Usage of this module as follows: -# -# find_package(LibOsmoSDR) -# -# -# Variables defined by this module: -# -# LIBOSMOSDR_FOUND System has libosmosdr libs/headers -# LIBOSMOSDR_LIBRARIES The libosmosdr libraries -# LIBOSMOSDR_INCLUDE_DIR The location of libosmosdr headers - - -if(NOT LIBOSMOSDR_FOUND) - pkg_check_modules (LIBOSMOSDR_PKG libosmosdr) - find_path(LIBOSMOSDR_INCLUDE_DIR NAMES osmosdr.h - PATHS - ${LIBOSMOSDR_PKG_INCLUDE_DIRS} - /usr/include - /usr/local/include - ) - - find_library(LIBOSMOSDR_LIBRARIES NAMES osmosdr - PATHS - ${LIBOSMOSDR_PKG_LIBRARY_DIRS} - /usr/lib - /usr/local/lib - ) - - if(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES) - set(LIBOSMOSDR_FOUND TRUE CACHE INTERNAL "libosmosdr found") - message(STATUS "Found libosmosdr: ${LIBOSMOSDR_INCLUDE_DIR}, ${LIBOSMOSDR_LIBRARIES}") - else(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES) - set(LIBOSMOSDR_FOUND FALSE CACHE INTERNAL "libosmosdr found") - message(STATUS "libosmosdr not found.") - endif(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES) - -mark_as_advanced(LIBOSMOSDR_INCLUDE_DIR LIBOSMOSDR_LIBRARIES) - -endif(NOT LIBOSMOSDR_FOUND) |