Updates to support OSX.

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

diff --git a/freedv-dev/CMakeLists.txt b/freedv-dev/CMakeLists.txt
index 666c5fa93ee92f6d37876a80ea168d9b2dacd7c5..4649ccfd750ea9db7ff1c3b3074d0a751c8ea3a3 100644 (file)
--- a/freedv-dev/CMakeLists.txt
+++ b/freedv-dev/CMakeLists.txt
@@ -6,6 +6,8 @@
 # mailing list: https://lists.sourceforge.net/lists/listinfo/freetel-codec2
 #
 
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" CACHE STRING "Minimum OS X deployment version")
+
 cmake_minimum_required(VERSION 2.8)
 
 # Prevent in-source builds to protect automake/autoconf config.
@@ -49,7 +51,6 @@ if(NOT CMAKE_BUILD_TYPE)
     message(STATUS "Build type not specified, defaulting to ${CMAKE_BUILD_TYPE}")
 endif(NOT CMAKE_BUILD_TYPE)
 
-
 # Work around for not using a svn working copy.
 add_definitions(-D_NO_AUTOTOOLS_)
 find_program(SVNVERSION_PATH svnversion)
@@ -72,7 +73,11 @@ endif()
 
 
 # Set default build flags.
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+if(APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11")
+endif(APPLE)
 
 #
 # Setup cmake options

diff --git a/freedv-dev/cmake/BuildCodec2.cmake b/freedv-dev/cmake/BuildCodec2.cmake
index 588b31610df45445bad890e17e61c71683e4e37f..038826d534b444a06a7d3b94572e8790aafbb230 100644 (file)
--- a/freedv-dev/cmake/BuildCodec2.cmake
+++ b/freedv-dev/cmake/BuildCodec2.cmake
@@ -15,7 +15,8 @@ endif()
 include(ExternalProject)
 ExternalProject_Add(codec2
    SVN_REPOSITORY https://svn.code.sf.net/p/freetel/code/codec2-dev
-   CMAKE_ARGS ${CODEC2_CMAKE_ARGS} ${SPEEXDSP_CMAKE_ARGS}
+   CMAKE_ARGS ${CODEC2_CMAKE_ARGS} ${SPEEXDSP_CMAKE_ARGS} 
+   CMAKE_CACHE_ARGS -DCMAKE_OSX_DEPLOYMENT_TARGET:string=10.7
    INSTALL_COMMAND ""
 )
 set(CODEC2_LIBRARIES

diff --git a/freedv-dev/cmake/BuildSpeex.cmake b/freedv-dev/cmake/BuildSpeex.cmake
index 262d558f2357e41e83907211fa2e99e1dffb04c7..8d287eadd05e16d6d07ec9167a8432fa7f1849e5 100644 (file)
--- a/freedv-dev/cmake/BuildSpeex.cmake
+++ b/freedv-dev/cmake/BuildSpeex.cmake
@@ -4,7 +4,11 @@ if(MINGW AND CMAKE_CROSSCOMPILING)
     include(cmake/MinGW.cmake)
     set(CONFIGURE_COMMAND ./configure --host=${HOST} --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-examples)
 else()
-    set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-examples)
+    if(APPLE)
+        set(CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/../configure_speexdsp_osx.sh ${CMAKE_BINARY_DIR}/external/dist)
+    else()
+        set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-examples)
+    endif()
 endif()
 
 include(ExternalProject)