diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-08-19 20:37:16 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-08-19 20:44:46 +0300 |
| commit | ae84db1d5d6a7ae93e1b74d429b243637131348c (patch) | |
| tree | a55817b02089e9294b22848311231f94e348fd79 | |
| parent | 3c3e6d756c4b507d5fb9d2da47d2c56527445111 (diff) | |
build_environment: buildfixes for boost
Disable hardcoded 64 bit build.
| -rw-r--r-- | build_files/build_environment/cmake/boost.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake index 9be6ea9f011..959a6e22637 100644 --- a/build_files/build_environment/cmake/boost.cmake +++ b/build_files/build_environment/cmake/boost.cmake @@ -16,6 +16,8 @@ # # ***** END GPL LICENSE BLOCK ***** +set(BOOST_ADDRESS_MODEL 64) + if(WIN32) if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") set(PYTHON_ARCH x64) @@ -25,6 +27,7 @@ if(WIN32) 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() if(MSVC14) set(BOOST_TOOLSET toolset=msvc-14.0) @@ -45,7 +48,7 @@ if(WIN32) #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_60/ ${HARVEST_TARGET}/boost/include/) + set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/) endif() elseif(APPLE) @@ -78,9 +81,6 @@ set(BOOST_OPTIONS ${BOOST_TOOLSET} ) - set(BOOST_ADDRESS_MODEL 64) - - string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE) ExternalProject_Add(external_boost |