diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-18 18:05:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-18 18:05:02 +0300 |
| commit | e95282e783f2cebb700c354ad181dd5efce50d04 (patch) | |
| tree | c775ea102783f363b90469f2cf5ba2bad1da4f79 /build_files | |
| parent | 4a3d94c0734d1475aa9a2fbe89039fbc59c9fb8d (diff) | |
| parent | 0301df40e5b6c51575d7f9013a1a28b901063829 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/boost.cmake | 4 | ||||
| -rw-r--r-- | build_files/build_environment/patches/boost.diff | 15 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake index 2c6bf195e07..46840b7ead4 100644 --- a/build_files/build_environment/cmake/boost.cmake +++ b/build_files/build_environment/cmake/boost.cmake @@ -53,17 +53,20 @@ if(WIN32) if(BUILD_MODE STREQUAL Release) set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_60/ ${HARVEST_TARGET}/boost/include/) endif() + set(BOOST_PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/boost/src/external_boost < ${PATCH_DIR}/boost.diff) elseif(APPLE) set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh) set(BOOST_BUILD_COMMAND ./bjam) set(BOOST_BUILD_OPTIONS toolset=clang cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off) set(BOOST_HARVEST_CMD echo .) + set(BOOST_PATCH_COMMAND echo .) else() set(BOOST_HARVEST_CMD echo .) set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh) set(BOOST_BUILD_COMMAND ./bjam) set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off) + set(BOOST_PATCH_COMMAND echo .) endif() set(BOOST_OPTIONS @@ -96,6 +99,7 @@ ExternalProject_Add(external_boost URL_HASH MD5=${BOOST_MD5} PREFIX ${BUILD_DIR}/boost UPDATE_COMMAND "" + PATCH_COMMAND ${BOOST_PATCH_COMMAND} CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND} BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=x86 address-model=${BOOST_ADDRESS_MODEL} variant=${BOOST_BUILD_TYPE} link=static threading=multi ${BOOST_OPTIONS} --prefix=${LIBDIR}/boost install BUILD_IN_SOURCE 1 diff --git a/build_files/build_environment/patches/boost.diff b/build_files/build_environment/patches/boost.diff new file mode 100644 index 00000000000..ea3ec035518 --- /dev/null +++ b/build_files/build_environment/patches/boost.diff @@ -0,0 +1,15 @@ +--- a/boost/config/compiler/visualc.hpp 2015-12-08 11:55:19 -0700 ++++ b/boost/config/compiler/visualc.hpp 2018-03-17 10:29:52 -0600 +@@ -287,12 +287,3 @@ + # define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION) + #endif + +-// +-// last known and checked version is 19.00.23026 (VC++ 2015 RTM): +-#if (_MSC_VER > 1900) +-# if defined(BOOST_ASSERT_CONFIG) +-# error "Unknown compiler version - please run the configure tests and report the results" +-# else +-# pragma message("Unknown compiler version - please run the configure tests and report the results") +-# endif +-#endif diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 7db26c3f7c0..1a5e6a3158a 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -9,6 +9,7 @@ set(WITH_INSTALL_PORTABLE ON CACHE BOOL "" FORCE) set(WITH_SYSTEM_GLEW ON CACHE BOOL "" FORCE) set(WITH_ALEMBIC OFF CACHE BOOL "" FORCE) +set(WITH_BOOST OFF CACHE BOOL "" FORCE) set(WITH_BUILDINFO OFF CACHE BOOL "" FORCE) set(WITH_BULLET OFF CACHE BOOL "" FORCE) set(WITH_CODEC_AVI OFF CACHE BOOL "" FORCE) @@ -54,4 +55,3 @@ set(WITH_RAYOPTIMIZATION OFF CACHE BOOL "" FORCE) set(WITH_SDL OFF CACHE BOOL "" FORCE) set(WITH_X11_XINPUT OFF CACHE BOOL "" FORCE) set(WITH_X11_XF86VMODE OFF CACHE BOOL "" FORCE) - |