[Bf-blender-cvs] [5c563cd903d] master: deps_builder: Cleanup boost.cmake on windows
Ray Molenkamp
noreply at git.blender.org
Wed Aug 12 16:21:43 CEST 2020
Commit: 5c563cd903ddceebfffbb1e86af2b406bbb2c457
Author: Ray Molenkamp
Date: Wed Aug 12 08:21:37 2020 -0600
Branches: master
https://developer.blender.org/rB5c563cd903ddceebfffbb1e86af2b406bbb2c457
deps_builder: Cleanup boost.cmake on windows
There were some remnants from previous boost::python support
and support for building 32 bit libs on windows, neither are
needed currently.
===================================================================
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 6e7ee8c66b1..062bdeb2473 100644
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -19,17 +19,6 @@
set(BOOST_ADDRESS_MODEL 64)
if(WIN32)
- if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
- set(PYTHON_ARCH x64)
- set(PYTHON_ARCH2 win-AMD64)
- set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/amd64/)
- else()
- set(PYTHON_ARCH x86)
- set(PYTHON_ARCH2 win32)
- set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
- set(BOOST_ADDRESS_MODEL 32)
- endif()
-
set(BOOST_TOOLSET toolset=msvc-14.1)
set(BOOST_COMPILER_STRING -vc141)
More information about the Bf-blender-cvs
mailing list