[Bf-blender-cvs] [704f6a51845] master: Buildbot: Fix paths to sndfile and flac

Sergey Sharybin noreply at git.blender.org
Tue Sep 5 16:18:44 CEST 2017


Commit: 704f6a51845e03132c4618f1b440b12f8c2ce117
Author: Sergey Sharybin
Date:   Tue Sep 5 16:17:48 2017 +0200
Branches: master
https://developer.blender.org/rB704f6a51845e03132c4618f1b440b12f8c2ce117

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