[Bf-blender-cvs] [99c9f17098e] master: deps build: correct sndfile fix

Arto Kitula noreply at git.blender.org
Wed Sep 20 12:20:57 CEST 2017


Commit: 99c9f17098ea44ceb4b51663fea4f1dd4c81160b
Author: Arto Kitula
Date:   Wed Sep 20 13:20:23 2017 +0300
Branches: master
https://developer.blender.org/rB99c9f17098ea44ceb4b51663fea4f1dd4c81160b

deps build: correct sndfile fix

===================================================================

M	build_files/build_environment/cmake/sndfile.cmake

===================================================================

diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake
index d54a71dd7ce..bc9574f2d77 100644
--- a/build_files/build_environment/cmake/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -27,12 +27,18 @@ else()
 	set(SNDFILE_OPTIONS --enable-static --disable-shared )
 endif()
 
+if(APPLE)
+	set(SNDFILE_CONFIGURE_ENV echo .)
+else()
+	set(SNDFILE_CONFIGURE_ENV ${CONFIGURE_ENV})
+endif()
+
 ExternalProject_Add(external_sndfile
 	URL ${SNDFILE_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${SNDFILE_HASH}
 	PREFIX ${BUILD_DIR}/sndfile
-	CONFIGURE_COMMAND cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
+	CONFIGURE_COMMAND ${SNDFILE_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



More information about the Bf-blender-cvs mailing list