From d8b19c44897373c53336585b3bb54b51a195ffcc Mon Sep 17 00:00:00 2001 From: Dimitri Stolnikov Date: Sat, 23 Mar 2013 00:09:50 +0100 Subject: gnuradioinput: adopt gnuradio component header structure --- cmake/Modules/FindGnuradioCore.cmake | 2 +- cmake/Modules/FindGnuradioOsmosdr.cmake | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'cmake') diff --git a/cmake/Modules/FindGnuradioCore.cmake b/cmake/Modules/FindGnuradioCore.cmake index 44f351d..6b4386e 100644 --- a/cmake/Modules/FindGnuradioCore.cmake +++ b/cmake/Modules/FindGnuradioCore.cmake @@ -3,7 +3,7 @@ PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core) FIND_PATH( GNURADIO_CORE_INCLUDE_DIRS - NAMES gr_random.h + NAMES gr_core_api.h HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio ${PC_GNURADIO_CORE_INCLUDEDIR} ${CMAKE_INSTALL_PREFIX}/include/gnuradio diff --git a/cmake/Modules/FindGnuradioOsmosdr.cmake b/cmake/Modules/FindGnuradioOsmosdr.cmake index 76b5a31..eaed9c7 100644 --- a/cmake/Modules/FindGnuradioOsmosdr.cmake +++ b/cmake/Modules/FindGnuradioOsmosdr.cmake @@ -3,12 +3,12 @@ PKG_CHECK_MODULES(PC_GNURADIO_OSMOSDR gnuradio-osmosdr) FIND_PATH( GNURADIO_OSMOSDR_INCLUDE_DIRS - NAMES osmosdr_api.h - HINTS $ENV{GNURADIO_OSMOSDR_DIR}/include/osmosdr + NAMES osmosdr/osmosdr_api.h + HINTS $ENV{GNURADIO_OSMOSDR_DIR}/include ${PC_GNURADIO_OSMOSDR_INCLUDEDIR} - ${CMAKE_INSTALL_PREFIX}/include/osmosdr - PATHS /usr/local/include/osmosdr - /usr/include/osmosdr + ${CMAKE_INSTALL_PREFIX}/include + PATHS /usr/local/include + /usr/include ) FIND_LIBRARY( -- cgit v1.2.3