From 2d1ad4977fbdd990fd9f2e51b1d1b5f8cbd60d73 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 17 Feb 2015 10:46:19 -0800
Subject: [PATCH] handle soxr build for android

---
 cmake/externals/soxr/CMakeLists.txt              | 10 +++++++++-
 cmake/macros/AddDependencyExternalProjects.cmake |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cmake/externals/soxr/CMakeLists.txt b/cmake/externals/soxr/CMakeLists.txt
index bb6f510eb6..0c21780cbc 100644
--- a/cmake/externals/soxr/CMakeLists.txt
+++ b/cmake/externals/soxr/CMakeLists.txt
@@ -1,11 +1,17 @@
 set(EXTERNAL_NAME soxr)
 
+if (ANDROID)
+  set(PLATFORM_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19" "-DHAVE_WORDS_BIGENDIAN_EXITCODE=1")
+else ()
+  set(PLATFORM_CMAKE_ARGS "-DBUILD_SHARED_LIBS=0")
+endif ()
+
 include(ExternalProject)
 ExternalProject_Add(
   ${EXTERNAL_NAME}
   PREFIX ${EXTERNAL_NAME}
   URL http://pkgs.fedoraproject.org/repo/pkgs/soxr/soxr-0.1.1-Source.tar.xz/805651a245ead381c82fad6247af5968/soxr-0.1.1-Source.tar.xz
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DBUILD_SHARED_LIBS=N
+  CMAKE_ARGS ${PLATFORM_CMAKE_ARGS} -DBUILD_TESTS=0 -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
   LOG_DOWNLOAD ON
 )
 
@@ -16,6 +22,8 @@ set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE TYPE STRING
 
 if (WIN32) 
   set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.lib CACHE TYPE STRING)
+elseif (ANDROID)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.so CACHE TYPE STRING)
 else ()
   set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.a CACHE TYPE STRING)
 endif ()
\ No newline at end of file
diff --git a/cmake/macros/AddDependencyExternalProjects.cmake b/cmake/macros/AddDependencyExternalProjects.cmake
index e739e9994a..3ae59dd18e 100644
--- a/cmake/macros/AddDependencyExternalProjects.cmake
+++ b/cmake/macros/AddDependencyExternalProjects.cmake
@@ -9,9 +9,9 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 
-macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS _PROJECTS)
+macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS)
   
-  foreach(_PROJ_NAME ${_PROJECTS})
+  foreach(_PROJ_NAME ${ARGN})
     
     string(TOUPPER ${_PROJ_NAME} _PROJ_NAME_UPPER)