[Bf-blender-cvs] [66f8a4c07e8] master: Build environment: Fix compilation of boost on Linux 32bit

Sergey Sharybin noreply at git.blender.org
Wed Aug 29 14:18:51 CEST 2018


Commit: 66f8a4c07e8a5fc166579101933264b8425a7cd1
Author: Sergey Sharybin
Date:   Wed Aug 29 14:11:32 2018 +0200
Branches: master
https://developer.blender.org/rB66f8a4c07e8a5fc166579101933264b8425a7cd1

Build environment: Fix compilation of boost on Linux 32bit

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

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 959a6e22637..33bfa1d4e82 100644
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -63,6 +63,11 @@ else()
 	set(BOOST_BUILD_COMMAND ./b2)
 	set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
 	set(BOOST_PATCH_COMMAND echo .)
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+		set(BOOST_ADDRESS_MODEL 64)
+	else()
+		set(BOOST_ADDRESS_MODEL 32)
+	endif()
 endif()
 
 set(BOOST_OPTIONS



More information about the Bf-blender-cvs mailing list