diff options
author | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-03-17 10:38:20 +0100 |
---|---|---|
committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-04-09 00:28:10 +0200 |
commit | fd56ae76403097a7a8d246d2467b8a5a2912b8df (patch) | |
tree | 208cac9eb1ec42ccc7f64d96eda9459c78a2cedd /cmake | |
parent | e77017f652e0fd00f83deb450193d7857e12b874 (diff) |
adopt gnuradio component header structure
this makes it neccessary to include headers with the osmosdr/ prefix
thanks to Alexandru Csete for pointing this out.
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/Modules/FindGnuradioAudio.cmake | 8 | ||||
-rw-r--r-- | cmake/Modules/FindGnuradioCore.cmake | 2 |
2 files changed, 5 insertions, 5 deletions
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 |