From 941aea3b92bcc9271fde2c07cae2b1a57ea99035 Mon Sep 17 00:00:00 2001
From: Davide Gerhard <rainbow@irh.it>
Date: Mon, 15 Apr 2019 10:42:39 +0200
Subject: [PATCH] cm256cc: fix path and pkgconfig discovery

---
 cmake/Modules/FindCM256cc.cmake                       | 8 ++++----
 plugins/channelrx/remotesink/remotesinkthread.cpp     | 2 +-
 plugins/channelrx/remotesink/remotesinkthread.h       | 2 +-
 plugins/channeltx/remotesource/remotesource.h         | 2 +-
 plugins/channeltx/remotesource/remotesourcethread.cpp | 2 +-
 plugins/samplesink/remoteoutput/udpsinkfecworker.h    | 2 +-
 plugins/samplesource/remoteinput/remoteinputbuffer.h  | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cmake/Modules/FindCM256cc.cmake b/cmake/Modules/FindCM256cc.cmake
index 1410e6618..43e95eb08 100644
--- a/cmake/Modules/FindCM256cc.cmake
+++ b/cmake/Modules/FindCM256cc.cmake
@@ -2,12 +2,12 @@ INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(PC_CM256cc "libcm256cc")
 
 FIND_PATH(CM256CC_INCLUDE_DIR
-    NAMES cm256.h
+    NAMES cm256cc/cm256.h
     HINTS ${PC_CM256CC_INCLUDE_DIR}
           ${CMAKE_INSTALL_PREFIX}/include
-    PATHS ${CM256CC_DIR}/include/cm256cc
-          /usr/local/include/cm256cc
-          /usr/include/cm256cc
+    PATHS ${CM256CC_DIR}/include
+          /usr/local/include
+          /usr/include
 )
 
 FIND_LIBRARY(CM256CC_LIBRARIES
diff --git a/plugins/channelrx/remotesink/remotesinkthread.cpp b/plugins/channelrx/remotesink/remotesinkthread.cpp
index e1bbb6ce8..0a4a7bfd9 100644
--- a/plugins/channelrx/remotesink/remotesinkthread.cpp
+++ b/plugins/channelrx/remotesink/remotesinkthread.cpp
@@ -26,7 +26,7 @@
 #include <channel/remotedatablock.h>
 #include <QUdpSocket>
 
-#include "cm256.h"
+#include "cm256cc/cm256.h"
 
 MESSAGE_CLASS_DEFINITION(RemoteSinkThread::MsgStartStop, Message)
 
diff --git a/plugins/channelrx/remotesink/remotesinkthread.h b/plugins/channelrx/remotesink/remotesinkthread.h
index 04160bd3a..cfe3af953 100644
--- a/plugins/channelrx/remotesink/remotesinkthread.h
+++ b/plugins/channelrx/remotesink/remotesinkthread.h
@@ -29,7 +29,7 @@
 #include <QWaitCondition>
 #include <QHostAddress>
 
-#include "cm256.h"
+#include "cm256cc/cm256.h"
 
 #include "util/message.h"
 #include "util/messagequeue.h"
diff --git a/plugins/channeltx/remotesource/remotesource.h b/plugins/channeltx/remotesource/remotesource.h
index 71494ba29..fb4d7840b 100644
--- a/plugins/channeltx/remotesource/remotesource.h
+++ b/plugins/channeltx/remotesource/remotesource.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QNetworkRequest>
 
-#include "cm256.h"
+#include "cm256cc/cm256.h"
 
 #include "dsp/basebandsamplesource.h"
 #include "channel/channelsourceapi.h"
diff --git a/plugins/channeltx/remotesource/remotesourcethread.cpp b/plugins/channeltx/remotesource/remotesourcethread.cpp
index c9dc8036e..5a3f4c3e1 100644
--- a/plugins/channeltx/remotesource/remotesourcethread.cpp
+++ b/plugins/channeltx/remotesource/remotesourcethread.cpp
@@ -22,7 +22,7 @@
 #include <algorithm>
 
 #include <QUdpSocket>
-#include "cm256.h"
+#include "cm256cc/cm256.h"
 
 
 
diff --git a/plugins/samplesink/remoteoutput/udpsinkfecworker.h b/plugins/samplesink/remoteoutput/udpsinkfecworker.h
index ecc2e96bd..c9e5a3bb3 100644
--- a/plugins/samplesink/remoteoutput/udpsinkfecworker.h
+++ b/plugins/samplesink/remoteoutput/udpsinkfecworker.h
@@ -24,7 +24,7 @@
 #include <QWaitCondition>
 #include <QHostAddress>
 
-#include "cm256.h"
+#include "cm256cc/cm256.h"
 
 #include "util/messagequeue.h"
 #include "util/message.h"
diff --git a/plugins/samplesource/remoteinput/remoteinputbuffer.h b/plugins/samplesource/remoteinput/remoteinputbuffer.h
index ae8938697..e4bb9c1d2 100644
--- a/plugins/samplesource/remoteinput/remoteinputbuffer.h
+++ b/plugins/samplesource/remoteinput/remoteinputbuffer.h
@@ -22,7 +22,7 @@
 #include <QString>
 #include <QDebug>
 #include <cstdlib>
-#include "cm256.h"
+#include "cm256cc/cm256.h"
 #include "util/movingaverage.h"