Commit: 2c61c3d733cfafa3d62829b716246b8a18ecd6a3
Author: Ray Molenkamp
Date: Sat Aug 15 11:06:16 2020 -0600
Branches: master
https://developer.blender.org/rB2c61c3d733cfafa3d62829b716246b8a18ecd6a3
deps_builder: Fix boost::python linking release python library
By default boost::python in debug configuration links the release
python libraries. Which leads to loading issues with the produced
modules in a debug blender (which does use the debug python libs)
Bjam has an option to switch this to the debug libraries but when
you switch that on it changes the library names for *all* boost
libraries, even ones that don't have anything to do with python
and even the release libraries.
therefore an alternative way has been chosen and we're dealing
with this by adding a define rather than asking bjam to do it.
===================================================================
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 22b5f33e690..d01c62b679c 100644
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -56,6 +56,12 @@ if(WITH_BOOST_PYTHON)
--with-python
--user-config=${JAM_FILE}
)
+ if(WIN32 AND BUILD_MODE STREQUAL Debug)
+ set(BOOST_PYTHON_OPTIONS
+ ${BOOST_PYTHON_OPTIONS}
+ define=BOOST_DEBUG_PYTHON
+ )
+ endif()
endif()
set(BOOST_OPTIONS
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
