[Bf-blender-cvs] [ec50734106e] blender-v2.79-release: Buildbot: Fix paths to sndfile and flac

Sergey Sharybin noreply at git.blender.org
Fri Sep 8 12:08:09 CEST 2017


Commit: ec50734106e23e57418a3caf78153e4fbdc21f72
Author: Sergey Sharybin
Date:   Tue Sep 5 16:17:48 2017 +0200
Branches: blender-v2.79-release
https://developer.blender.org/rBec50734106e23e57418a3caf78153e4fbdc21f72

Buildbot: Fix paths to sndfile and flac

Need this in 2.79 branch as well, since build rules are based on this files.

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

M	build_files/buildbot/config/blender_linux.cmake

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

diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index 56f18967300..95265754d74 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -70,7 +70,7 @@ set(FFMPEG_LIBRARIES
 )
 
 # SndFile libraries
-set(SNDFILE_LIBRARY          "/usr/lib/libsndfile.a;/usr/lib/libFLAC.a" CACHE STRING "" FORCE)
+set(SNDFILE_LIBRARY          "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILIB}/libFLAC.a" CACHE STRING "" FORCE)
 
 # OpenAL libraries
 set(OPENAL_ROOT_DIR           "/opt/lib/openal" CACHE STRING "" FORCE)



More information about the Bf-blender-cvs mailing list