From 444b8d442820615f6e2ea1a70c070b986037d640 Mon Sep 17 00:00:00 2001
From: hobbes1069 <hobbes1069@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Mon, 23 Apr 2018 20:39:22 +0000
Subject: [PATCH] Build tree fixes which allow building FreeDV against a build
 tree of codec2 instead of the system or static build.

git-svn-id: https://svn.code.sf.net/p/freetel/code@3519 01035d8c-6547-0410-b346-abe4f91aad63
---
 codec2-dev/CMakeLists.txt |  2 +-
 freedv-dev/CMakeLists.txt | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/codec2-dev/CMakeLists.txt b/codec2-dev/CMakeLists.txt
index 4e70a3b5..ad915242 100644
--- a/codec2-dev/CMakeLists.txt
+++ b/codec2-dev/CMakeLists.txt
@@ -169,7 +169,7 @@ if(UNITTEST)
     # Find speex library
     #
     message(STATUS "Looking for Speex DSP library.")
-    find_path(SPEEXDSP_INCLUDE_DIR speex/speex.h)
+    find_path(SPEEXDSP_INCLUDE_DIR speex/speex_preprocess.h)
     find_library(SPEEXDSP_LIBRARY speexdsp)
     message(STATUS "  Speex DSP headers: ${SPEEXDSP_INCLUDE_DIR}")
     message(STATUS "  Speex DSP library: ${SPEEXDSP_LIBRARY}")
diff --git a/freedv-dev/CMakeLists.txt b/freedv-dev/CMakeLists.txt
index fdc1c01e..75a8a9a5 100644
--- a/freedv-dev/CMakeLists.txt
+++ b/freedv-dev/CMakeLists.txt
@@ -196,6 +196,21 @@ message(STATUS "Threads library flags: ${CMAKE_THREAD_LIBS_INIT}")
 #
 # Find codec2
 #
+if(CODEC2_BUILD_DIR)
+    message(STATUS "Using codec2 from build directory...")
+    load_cache(${CODEC2_BUILD_DIR} codec2_SOURCE_DIR)
+    get_filename_component(CODEC2_BUILD_INCLUDE_DIR ${CODEC2_BUILD_DIR} 
+        ABSOLUTE BASE_DIR ${CMAKE_BINARY_DIR})
+    message(STATUS "  Build dir: ${CODEC2_BUILD_INCLUDE_DIR}")
+    find_path(CODEC2_SOURCE_INCLUDE_DIR codec2.h
+        PATHS ${codec2_SOURCE_DIR}
+        PATH_SUFFIXES src
+        NO_DEFAULT_PATH)
+    message(STATUS "  Source include dir: ${CODEC2_SOURCE_INCLUDE_DIR}")
+    find_library(CODEC2_LIBRARY NAMES codec2 PATH_SUFFIXES src)
+    include_directories(${CODEC2_SOURCE_INCLUDE_DIR}
+        ${CODEC2_BUILD_INCLUDE_DIR})
+else(CODEC2_BUILD_DIR)
 if(NOT USE_STATIC_CODEC2)
     message(STATUS "Looking for codec2...")
     # 'CONFIG' removed due to incompatibility with cmake version
@@ -228,6 +243,8 @@ else(NOT USE_STATIC_CODEC2)
     message(STATUS "Will attempt static build of codec2.")
     include(cmake/BuildCodec2.cmake)
 endif(NOT USE_STATIC_CODEC2)
+endif(CODEC2_BUILD_DIR)
+
 
 #
 # Find or build portaudio Library
-- 
2.25.1