Try searching for gr-osmosdr in Config mode

This commit is contained in:
Clayton Smith 2022-01-27 21:36:19 -05:00
parent a7912a7861
commit 93d6d98fd5
3 changed files with 5 additions and 36 deletions

View File

@ -125,11 +125,12 @@ find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets)
if(NOT Qt6_FOUND)
find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets Svg)
endif()
include(FindPkgConfig)
find_package(Gnuradio-osmosdr REQUIRED)
find_package(Boost REQUIRED COMPONENTS chrono)
find_package(gr-iqbal NAMES gnuradio gnuradio-iqbalance)
find_package(gr-osmosdr NAMES osmosdr gnuradio-osmosdr)
set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG AUDIO BLOCKS DIGITAL FILTER FFT PMT)
find_package(Gnuradio REQUIRED COMPONENTS analog audio blocks digital filter fft network)
find_package(Gnuradio REQUIRED COMPONENTS analog audio blocks digital filter fft network uhd)
if(NOT Gnuradio_FOUND)
message(FATAL_ERROR "GnuRadio Runtime required to compile gqrx")
endif()
@ -248,7 +249,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Finish configuring compiler / linker settings & flags
include_directories(
${CMAKE_SOURCE_DIR}/include
${GNURADIO_OSMOSDR_INCLUDE_DIRS}
)
link_directories(

View File

@ -1,31 +0,0 @@
if(NOT PKG_CONFIG_FOUND)
INCLUDE(FindPkgConfig)
endif()
PKG_CHECK_MODULES(PC_GNURADIO_OSMOSDR gnuradio-osmosdr)
FIND_PATH(
GNURADIO_OSMOSDR_INCLUDE_DIRS
NAMES osmosdr/source.h
HINTS $ENV{GNURADIO_OSMOSDR_DIR}/include
${PC_GNURADIO_OSMOSDR_INCLUDEDIR}
${CMAKE_INSTALL_PREFIX}/include/osmosdr
PATHS /usr/local/include/osmosdr
/usr/include/osmosdr
)
FIND_LIBRARY(
GNURADIO_OSMOSDR_LIBRARIES
NAMES gnuradio-osmosdr
HINTS $ENV{GNURADIO_OSMOSDR_DIR}/lib
${PC_GNURADIO_OSMOSDR_LIBDIR}
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib64
PATHS /usr/local/lib
/usr/local/lib64
/usr/lib
/usr/lib64
)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gnuradio-osmosdr DEFAULT_MSG GNURADIO_OSMOSDR_LIBRARIES GNURADIO_OSMOSDR_INCLUDE_DIRS)
MARK_AS_ADVANCED(GNURADIO_OSMOSDR_LIBRARIES GNURADIO_OSMOSDR_INCLUDE_DIRS)

View File

@ -95,7 +95,7 @@ else()
endif()
target_link_libraries(${PROJECT_NAME}
${GNURADIO_OSMOSDR_LIBRARIES}
gnuradio::gnuradio-osmosdr
${PULSEAUDIO_LIBRARY}
${PULSE-SIMPLE}
${PORTAUDIO_LIBRARIES}