[Bf-blender-cvs] [3c3d38d] master: Fix T46949: Latest blender builds are using shared pcre and xml2 libraries

Sergey Sharybin noreply at git.blender.org
Fri Dec 11 13:19:19 CET 2015


Commit: 3c3d38dd020bef55c668b0b7350b766d7c786388
Author: Sergey Sharybin
Date:   Fri Dec 11 17:18:37 2015 +0500
Branches: master
https://developer.blender.org/rB3c3d38dd020bef55c668b0b7350b766d7c786388

Fix T46949: Latest blender builds are using shared pcre and xml2 libraries

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

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 10c87e1..d4895ce 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -63,7 +63,11 @@ set(OPENAL_LIBRARY
 )
 
 # OpenCollada libraries
-set(OPENCOLLADA_UTF_LIBRARY   "" CACHE STRING "" FORCE)
+set(OPENCOLLADA_UTF_LIBRARY   ""                   CACHE STRING "" FORCE)
+set(PCRE_INCLUDE_DIR          "/usr/include"       CACHE STRING "" FORCE)
+set(PCRE_LIBRARY              "/usr/lib/libpcre.a" CACHE STRING "" FORCE)
+set(XML2_INCLUDE_DIR          "/usr/include"       CACHE STRING "" FORCE)
+set(XML2_LIBRARY              "/usr/lib/libxml2.a" CACHE STRING "" FORCE)
 
 # OpenColorIO libraries
 set(OPENCOLORIO_ROOT_DIR      "/opt/lib/ocio" CACHE STRING "" FORCE)




More information about the Bf-blender-cvs mailing list