From 9d5c6f765e54a412b421e6ecd26ba678847cddf2 Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Mon, 15 Apr 2019 10:40:09 +0200 Subject: [PATCH] libdsdcc: fix path and pkgconfig discovery --- cmake/Modules/FindLibDSDcc.cmake | 6 +++--- plugins/channelrx/demoddsd/dsddecoder.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/FindLibDSDcc.cmake b/cmake/Modules/FindLibDSDcc.cmake index c372583c5..a7fb016b0 100644 --- a/cmake/Modules/FindLibDSDcc.cmake +++ b/cmake/Modules/FindLibDSDcc.cmake @@ -2,11 +2,11 @@ if(NOT LIBDSDCC_FOUND) - pkg_check_modules (LIBDSDCC_PKG libdsdcc) + pkg_check_modules(LIBDSDCC_PKG libdsdcc) find_path(LIBDSDCC_INCLUDE_DIR - NAMES dsd_decoder.h - PATHS ${DSDCC_DIR}/include/dsdcc + NAMES dsdcc/dsd_decoder.h + PATHS ${DSDCC_DIR}/include ${LIBDSDCC_PKG_INCLUDE_DIRS} /usr/include/dsdcc /usr/local/include/dsdcc diff --git a/plugins/channelrx/demoddsd/dsddecoder.h b/plugins/channelrx/demoddsd/dsddecoder.h index 75f57bc78..ca2f84ebb 100644 --- a/plugins/channelrx/demoddsd/dsddecoder.h +++ b/plugins/channelrx/demoddsd/dsddecoder.h @@ -19,7 +19,7 @@ #ifndef PLUGINS_CHANNELRX_DEMODDSD_DSDDECODER_H_ #define PLUGINS_CHANNELRX_DEMODDSD_DSDDECODER_H_ -#include "dsd_decoder.h" +#include "dsdcc/dsd_decoder.h" class AudioFifo;