From: hobbes1069 <hobbes1069@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Fri, 11 Sep 2015 16:31:40 +0000 (+0000)
Subject: Prepare of FreeDV 1.0.1 tag
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=6317cebeccda30ced1a25f6dfffab47f6e092f0a;p=freetel-svn-tracking.git

Prepare of FreeDV 1.0.1 tag

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

diff --git a/freedv/branches/1.0/CMakeLists.txt b/freedv/branches/1.0/CMakeLists.txt
index ade2123f..68b1a424 100644
--- a/freedv/branches/1.0/CMakeLists.txt
+++ b/freedv/branches/1.0/CMakeLists.txt
@@ -29,7 +29,7 @@ project(FreeDV)
 #
 set(FREEDV_VERSION_MAJOR 1)
 set(FREEDV_VERSION_MINOR 0)
-set(FREEDV_VERSION_PATCH FALSE)
+set(FREEDV_VERSION_PATCH 1)
 set(FREEDV_VERSION ${FREEDV_VERSION_MAJOR}.${FREEDV_VERSION_MINOR})
 if(FREEDV_VERSION_PATCH)
     set(FREEDV_VERSION ${FREEDV_VERSION}.${FREEDV_VERSION_PATCH})
diff --git a/freedv/branches/1.0/cmake/BuildCodec2.cmake b/freedv/branches/1.0/cmake/BuildCodec2.cmake
index 044884ef..d80987e1 100644
--- a/freedv/branches/1.0/cmake/BuildCodec2.cmake
+++ b/freedv/branches/1.0/cmake/BuildCodec2.cmake
@@ -6,10 +6,10 @@ if(USE_STATIC_SPEEXDSP)
         -DSPEEXDSP_INCLUDE_DIR=${CMAKE_BINARY_DIR}/external/dist/include)
 endif()
 
-set(CODEC2_CMAKE_ARGS "-DUNITTEST=FALSE")
+set(CODEC2_CMAKE_ARGS -DUNITTEST=FALSE)
 
 if(CMAKE_CROSSCOMPILING)
-    set(CODEC2_CMAKE_ARGS "${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)