diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-29 17:09:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-29 17:09:59 +0300 |
| commit | 31278eb4bcc73f95b5032d65ababf32812074c5c (patch) | |
| tree | 5422141293391de231224143fb75dd0144fb78e3 /build_files/build_environment/cmake/boost.cmake | |
| parent | e81c352746483acb50fbeddbba4249cdcb51d952 (diff) | |
| parent | b2c707747da9f930a05499e98874c35d9aee7193 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/build_environment/cmake/boost.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/boost.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake index 959a6e22637..33bfa1d4e82 100644 --- a/build_files/build_environment/cmake/boost.cmake +++ b/build_files/build_environment/cmake/boost.cmake @@ -63,6 +63,11 @@ else() set(BOOST_BUILD_COMMAND ./b2) set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off) set(BOOST_PATCH_COMMAND echo .) + if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(BOOST_ADDRESS_MODEL 64) + else() + set(BOOST_ADDRESS_MODEL 32) + endif() endif() set(BOOST_OPTIONS |