[Bf-blender-cvs] [87d3685e935] master: deps/cleanup: remove partial boost-python support.
Lazydodo
noreply at git.blender.org
Wed Aug 14 01:03:32 CEST 2019
Commit: 87d3685e9352a11dec3d093a3473ac1e5b8121d2
Author: Lazydodo
Date: Tue Aug 13 17:00:23 2019 -0600
Branches: master
https://developer.blender.org/rB87d3685e9352a11dec3d093a3473ac1e5b8121d2
deps/cleanup: remove partial boost-python support.
boost python was not required by any dependency nor was it ever properly supported.
===================================================================
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 7fcd7e754ae..fabc055ce29 100644
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -33,19 +33,9 @@ if(WIN32)
set(BOOST_TOOLSET toolset=msvc-14.0)
set(BOOST_COMPILER_STRING -vc140)
endif()
- set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
- set(semi_path "${PATCH_DIR}/semi.txt")
- FILE(TO_NATIVE_PATH ${semi_path} semi_path)
- set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
- echo using python : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
- echo. : ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
- echo. : ${BUILD_DIR}/python/src/external_python/pcbuild >> "${JAM_FILE}" &&
- type ${semi_path} >> "${JAM_FILE}"
- )
+ set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
set(BOOST_BUILD_COMMAND bjam)
- #--user-config=user-config.jam
set(BOOST_BUILD_OPTIONS runtime-link=static )
- #set(BOOST_WITH_PYTHON --with-python)
set(BOOST_HARVEST_CMD ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
if(BUILD_MODE STREQUAL Release)
set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
@@ -82,7 +72,6 @@ set(BOOST_OPTIONS
--with-serialization
--with-program_options
--with-iostreams
- ${BOOST_WITH_PYTHON}
${BOOST_TOOLSET}
)
@@ -100,10 +89,3 @@ ExternalProject_Add(external_boost
BUILD_IN_SOURCE 1
INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
)
-
-if(WIN32)
- add_dependencies(
- external_boost
- Make_Python_Environment
- )
-endif()
More information about the Bf-blender-cvs
mailing list