From ed492b55645b22711dfe2384bea1c7cc3705e5bb Mon Sep 17 00:00:00 2001
From: hobbes1069 <hobbes1069@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Thu, 2 Jul 2015 02:25:35 +0000
Subject: [PATCH] Bump codec2-dev version to 0.4.0 and final tweaks for win32
 cross-compiling.

git-svn-id: https://svn.code.sf.net/p/freetel/code@2233 01035d8c-6547-0410-b346-abe4f91aad63
---
 codec2-dev/CMakeLists.txt      | 2 +-
 fdmdv2-dev/CMakeLists.txt      | 1 +
 fdmdv2/CMakeLists.txt          | 6 +++---
 fdmdv2/cmake/BuildCodec2.cmake | 6 +++++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/codec2-dev/CMakeLists.txt b/codec2-dev/CMakeLists.txt
index e2b270ae..48b830e2 100644
--- a/codec2-dev/CMakeLists.txt
+++ b/codec2-dev/CMakeLists.txt
@@ -35,7 +35,7 @@ endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 # file at some point.
 #
 set(CODEC2_VERSION_MAJOR 0)
-set(CODEC2_VERSION_MINOR 3)
+set(CODEC2_VERSION_MINOR 4)
 # Set to patch level if needed, otherwise leave FALSE.
 set(CODEC2_VERSION_PATCH FALSE)
 set(CODEC2_VERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}")
diff --git a/fdmdv2-dev/CMakeLists.txt b/fdmdv2-dev/CMakeLists.txt
index a4fe30b3..49c664d1 100644
--- a/fdmdv2-dev/CMakeLists.txt
+++ b/fdmdv2-dev/CMakeLists.txt
@@ -472,6 +472,7 @@ if(WIN32)
     #set(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
     set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\freedv.exe")
     set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
+    set(CPACK_NSIS_PACKAGE_NAME "FreeDV")
     set(CPACK_NSIS_URL_INFO_ABOUT "http://freedv.org")
     set(CPACK_NSIS_MODIFY_PATH OFF)
     set(CPACK_NSIS_MENU_LINKS "http://freedv.org" "FreeDV Homepage")
diff --git a/fdmdv2/CMakeLists.txt b/fdmdv2/CMakeLists.txt
index b6e232ac..fd61d525 100644
--- a/fdmdv2/CMakeLists.txt
+++ b/fdmdv2/CMakeLists.txt
@@ -447,11 +447,11 @@ if(WIN32)
     endif()
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "FreeDV")
     set(CPACK_PACKAGE_EXECUTABLES freedv;FreeDV)
-    # There is a bug in NSI that does not handle full unix paths properly. Make
-    # sure there is at least one set of four (4) backlasshes.
-    #set(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
+    set(CPACK_STRIP_FILES TRUE)
+    # NSIS specific settings
     set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\freedv.exe")
     set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
+    set(CPACK_NSIS_PACKAGE_NAME "FreeDV")
     set(CPACK_NSIS_URL_INFO_ABOUT "http://freedv.org")
     set(CPACK_NSIS_MODIFY_PATH OFF)
     set(CPACK_NSIS_MENU_LINKS "http://freedv.org" "FreeDV Homepage")
diff --git a/fdmdv2/cmake/BuildCodec2.cmake b/fdmdv2/cmake/BuildCodec2.cmake
index 8973b582..034bc462 100644
--- a/fdmdv2/cmake/BuildCodec2.cmake
+++ b/fdmdv2/cmake/BuildCodec2.cmake
@@ -1,7 +1,11 @@
+if(CMAKE_CROSSCOMPILING)
+    set(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
-   CMAKE_ARGS -DBUILD_SHARED_LIBS=FALSE 
+   CMAKE_ARGS ${CODEC2_CMAKE_ARGS}
    INSTALL_COMMAND ""
 )
 set(CODEC2_LIBRARIES
-- 
2.25.1