From: hobbes1069 <hobbes1069@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 11 Sep 2015 13:56:00 +0000 (+0000)
Subject: Freedv release builds should checkout release branches of codec2, not codec2-dev.
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=c4dd4575643c134c5edc273fa01c5130cd09988b;p=freetel-svn-tracking.git

Freedv release builds should checkout release branches of codec2, not codec2-dev.

git-svn-id: https://svn.code.sf.net/p/freetel/code@2307 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/freedv-dev/cmake/BuildCodec2.cmake b/freedv-dev/cmake/BuildCodec2.cmake
index 471eef8d..c29d1243 100644
--- a/freedv-dev/cmake/BuildCodec2.cmake
+++ b/freedv-dev/cmake/BuildCodec2.cmake
@@ -6,8 +6,10 @@ if(USE_STATIC_SPEEXDSP)
         -DSPEEXDSP_INCLUDE_DIR=${CMAKE_BINARY_DIR}/external/dist/include)
 endif()
 
+set(CODEC2_CMAKE_ARGS "-DUNITTEST=FALSE")
+
 if(CMAKE_CROSSCOMPILING)
-    set(CODEC2_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+    set(CODEC2_CMAKE_ARGS "${CODEC2_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
 endif()
 
 include(ExternalProject)
diff --git a/freedv/branches/1.0/cmake/BuildCodec2.cmake b/freedv/branches/1.0/cmake/BuildCodec2.cmake
index 471eef8d..044884ef 100644
--- a/freedv/branches/1.0/cmake/BuildCodec2.cmake
+++ b/freedv/branches/1.0/cmake/BuildCodec2.cmake
@@ -6,13 +6,15 @@ if(USE_STATIC_SPEEXDSP)
         -DSPEEXDSP_INCLUDE_DIR=${CMAKE_BINARY_DIR}/external/dist/include)
 endif()
 
+set(CODEC2_CMAKE_ARGS "-DUNITTEST=FALSE")
+
 if(CMAKE_CROSSCOMPILING)
-    set(CODEC2_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
+    set(CODEC2_CMAKE_ARGS "${CODEC2_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
 endif()
 
 include(ExternalProject)
 ExternalProject_Add(codec2
-   SVN_REPOSITORY https://svn.code.sf.net/p/freetel/code/codec2-dev
+   SVN_REPOSITORY https://svn.code.sf.net/p/freetel/code/codec2/branches/0.4
    CMAKE_ARGS ${CODEC2_CMAKE_ARGS} ${SPEEXDSP_CMAKE_ARGS}
    INSTALL_COMMAND ""
 )