[Bf-blender-cvs] [f0edb853be5] master: Build: fix make deps using system webp/sndio libs.

Brecht Van Lommel noreply at git.blender.org
Mon Apr 9 15:25:42 CEST 2018


Commit: f0edb853be53c8d1c19116cf69243b15bb6dce2c
Author: Brecht Van Lommel
Date:   Mon Apr 9 15:06:33 2018 +0200
Branches: master
https://developer.blender.org/rBf0edb853be53c8d1c19116cf69243b15bb6dce2c

Build: fix make deps using system webp/sndio libs.

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

M	build_files/build_environment/cmake/openal.cmake
M	build_files/build_environment/cmake/openimageio.cmake

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

diff --git a/build_files/build_environment/cmake/openal.cmake b/build_files/build_environment/cmake/openal.cmake
index d63c4443ca0..3331361bfbc 100644
--- a/build_files/build_environment/cmake/openal.cmake
+++ b/build_files/build_environment/cmake/openal.cmake
@@ -25,6 +25,7 @@ if(BUILD_MODE STREQUAL Release)
 		-DALSOFT_CONFIG=Off
 		-DALSOFT_HRTF_DEFS=Off
 		-DALSOFT_INSTALL=On
+		-DALSOFT_BACKEND_SNDIO=Off
 	)
 
 	if(UNIX)
diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake
index 07f6b3cdbef..fdc71508e47 100644
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -90,6 +90,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
 	-DUSE_PYTHON=OFF
 	-DUSE_PYTHON3=OFF
 	-DUSE_OCIO=OFF
+	-DUSE_WEBP=${WITH_WEBP}
 	-DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
 	-DOIIO_BUILD_TESTS=OFF
 	-DBUILD_TESTING=OFF



More information about the Bf-blender-cvs mailing list