From fd56ae76403097a7a8d246d2467b8a5a2912b8df Mon Sep 17 00:00:00 2001 From: Dimitri Stolnikov Date: Sun, 17 Mar 2013 10:38:20 +0100 Subject: adopt gnuradio component header structure this makes it neccessary to include headers with the osmosdr/ prefix thanks to Alexandru Csete for pointing this out. --- cmake/Modules/FindGnuradioAudio.cmake | 8 ++++---- cmake/Modules/FindGnuradioCore.cmake | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'cmake') diff --git a/cmake/Modules/FindGnuradioAudio.cmake b/cmake/Modules/FindGnuradioAudio.cmake index 63207f5..246568f 100644 --- a/cmake/Modules/FindGnuradioAudio.cmake +++ b/cmake/Modules/FindGnuradioAudio.cmake @@ -3,11 +3,11 @@ PKG_CHECK_MODULES(PC_GNURADIO_AUDIO gnuradio-audio) FIND_PATH( GNURADIO_AUDIO_INCLUDE_DIRS - NAMES gr_audio_api.h - HINTS $ENV{GNURADIO_AUDIO_DIR}/include/gnuradio + NAMES gnuradio/gr_audio_api.h + HINTS $ENV{GNURADIO_AUDIO_DIR}/include ${PC_GNURADIO_AUDIO_INCLUDEDIR} - PATHS /usr/local/include/gnuradio - /usr/include/gnuradio + PATHS /usr/local/include + /usr/include ) FIND_LIBRARY( 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 -- cgit v1.2.3