From c7befe8018dad8e2f8349a4a746430ddba3235b0 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 17 Feb 2015 11:56:30 -0800 Subject: [PATCH] build the dynamic soxr to reduce manual linking --- cmake/externals/soxr/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/externals/soxr/CMakeLists.txt b/cmake/externals/soxr/CMakeLists.txt index e65b171cfb..1c74a6904a 100644 --- a/cmake/externals/soxr/CMakeLists.txt +++ b/cmake/externals/soxr/CMakeLists.txt @@ -2,8 +2,6 @@ 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) @@ -22,8 +20,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) +elseif (APPLE) + set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.dylib CACHE TYPE STRING) else () - set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.a CACHE TYPE STRING) + set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.so CACHE TYPE STRING) endif () \ No newline at end of file