Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArto Kitula <arto.kitula@gmail.com>2017-09-26 02:17:39 +0300
committerArto Kitula <arto.kitula@gmail.com>2017-09-26 02:17:39 +0300
commite8a0812a3b964f2a8d7cb0c816086dbf277717ff (patch)
treeb757b6f5ead3f13a7f77ff06bc53a3128c753c9a /build_files/build_environment/cmake/sndfile.cmake
parent675cef0a165ad535546f24faf9d0ac474f704e64 (diff)
deps libs: fix xiph library support on sndfile on macOS
Diffstat (limited to 'build_files/build_environment/cmake/sndfile.cmake')
-rw-r--r--build_files/build_environment/cmake/sndfile.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake
index bc9574f2d77..ce10f07c133 100644
--- a/build_files/build_environment/cmake/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -28,9 +28,9 @@ else()
endif()
if(APPLE)
- set(SNDFILE_CONFIGURE_ENV echo .)
+ set(SNDFILE_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/sndfile/src/external_sndfile < ${PATCH_DIR}/sndfile.diff)
else()
- set(SNDFILE_CONFIGURE_ENV ${CONFIGURE_ENV})
+ set(SNDFILE_PATCH_CMD)
endif()
ExternalProject_Add(external_sndfile
@@ -38,7 +38,8 @@ ExternalProject_Add(external_sndfile
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${SNDFILE_HASH}
PREFIX ${BUILD_DIR}/sndfile
- CONFIGURE_COMMAND ${SNDFILE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
+ PATCH_COMMAND ${SNDFILE_PATCH_CMD}
+ CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install
INSTALL_DIR ${LIBDIR}/sndfile