Update dependencies and pass needed agruments to static Codec2 build since it also...

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

diff --git a/fdmdv2-dev/cmake/BuildCodec2.cmake b/fdmdv2-dev/cmake/BuildCodec2.cmake
index dd2a585cd21654fdfd2ec50f2cc90539e2972798..a1cd95c28f6bda126d30362ad43793c856d21142 100644 (file)
--- a/fdmdv2-dev/cmake/BuildCodec2.cmake
+++ b/fdmdv2-dev/cmake/BuildCodec2.cmake
@@ -1,7 +1,15 @@
+set(SPEEXDSP_CMAKE_ARGS -DBUILD_SHARED_LIBS=FALSE -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/external/dist)
+
+if(USE_STATIC_SPEEXDSP)
+    list(APPEND SPEEXDSP_CMAKE_ARGS 
+        -DSPEEXDSP_LIBRARIES=${CMAKE_BINARY_DIR}/external/dist/lib/libspeexdsp.a
+        -DSPEEXDSP_INCLUDE_DIR=${CMAKE_BINARY_DIR}/external/dist/include)
+endif()
+
 include(ExternalProject)
 ExternalProject_Add(codec2
    SVN_REPOSITORY https://svn.code.sf.net/p/freetel/code/codec2-dev
-   CMAKE_ARGS -DBUILD_SHARED_LIBS=FALSE -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/external/dist
+   CMAKE_ARGS ${SPEEXDSP_CMAKE_ARGS}
    INSTALL_COMMAND ""
 )
 set(CODEC2_LIBRARIES

diff --git a/fdmdv2-dev/cmake/BuildSpeex.cmake b/fdmdv2-dev/cmake/BuildSpeex.cmake
index 3a437c19084351ac541d51c664cfc5e420351bf6..17b53d6baa4a23158f06cb9a9a0995e1fc7cb830 100644 (file)
--- a/fdmdv2-dev/cmake/BuildSpeex.cmake
+++ b/fdmdv2-dev/cmake/BuildSpeex.cmake
@@ -1,5 +1,4 @@
 set(SPEEXDSP_TARBALL "speexdsp-1.2rc3.tar.gz")
-#set(SPEEXDSP_TARBALL "speex-1.0.5.tar.gz")
 
 include(ExternalProject)
 ExternalProject_Add(speex
@@ -15,3 +14,6 @@ set(SPEEXDSP_LIBRARIES ${CMAKE_BINARY_DIR}/external/dist/lib/libspeexdsp.a)
 include_directories(${CMAKE_BINARY_DIR}/external/dist/include)
 list(APPEND FREEDV_LINK_LIBS ${SPEEXDSP_LIBRARIES})
 list(APPEND FREEDV_STATIC_DEPS speex)
+if(USE_STATIC_CODEC2)
+    add_dependencies(codec2 speex)
+endif()