[Bf-blender-cvs] [cb6f9c2f198] blender-v2.82-release: Make deps: Force some boost dependencies
Sergey Sharybin
noreply at git.blender.org
Fri Jan 24 15:22:30 CET 2020
Commit: cb6f9c2f198eb2a8ec2e85bd112dceae0bda15f2
Author: Sergey Sharybin
Date: Fri Jan 24 14:10:01 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBcb6f9c2f198eb2a8ec2e85bd112dceae0bda15f2
Make deps: Force some boost dependencies
Boost could have picked up system-wide libbz2-dev installed and enable
this compression in iostreams. Nothing really wrong with this, but it
makes it so final Blender binary depends on bz2, which breaks default
linker flags.
This commit makes it so Boost is not using libraries which we don't
need, simplifying linking setup.
Differential Revision: https://developer.blender.org/D6668
===================================================================
M build_files/build_environment/cmake/boost.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake
index c11e14f879b..9a4e6d25c23 100644
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -72,6 +72,9 @@ set(BOOST_OPTIONS
--with-serialization
--with-program_options
--with-iostreams
+ -sNO_BZIP2=1
+ -sNO_LZMA=1
+ -sNO_ZSTD=1
${BOOST_TOOLSET}
)
More information about the Bf-blender-cvs
mailing list