diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-06-04 16:13:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-06-05 01:58:31 +0300 |
| commit | 0b28f0410ce5b90f75d3b5138fae2105d3ff1771 (patch) | |
| tree | 8f9fe6f7b588531e14f44aba72aac07a9451cea4 /build_files/build_environment/cmake | |
| parent | b168c255aae848f730a12b9cb16e88681a0c6809 (diff) | |
Fix make deps build errors with conflicting Boost system packages
Diffstat (limited to 'build_files/build_environment/cmake')
5 files changed, 6 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/alembic.cmake b/build_files/build_environment/cmake/alembic.cmake index 06f8b9184c3..95a461c64b3 100644 --- a/build_files/build_environment/cmake/alembic.cmake +++ b/build_files/build_environment/cmake/alembic.cmake @@ -38,6 +38,7 @@ set(ALEMBIC_EXTRA_ARGS -DBoost_DEBUG=ON -DBOOST_ROOT=${LIBDIR}/boost -DBoost_NO_SYSTEM_PATHS=ON + -DBoost_NO_BOOST_CMAKE=ON -DILMBASE_ROOT=${LIBDIR}/openexr -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/openexr/include/OpenEXR -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT} diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake index 6ff238468fb..4254d923de1 100644 --- a/build_files/build_environment/cmake/openimageio.cmake +++ b/build_files/build_environment/cmake/openimageio.cmake @@ -67,6 +67,7 @@ set(OPENIMAGEIO_EXTRA_ARGS -DBOOST_ROOT=${LIBDIR}/boost -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/ -DBoost_NO_SYSTEM_PATHS=ON + -DBoost_NO_BOOST_CMAKE=ON -OIIO_BUILD_CPP11=ON -DUSE_LIBSQUISH=OFF -DUSE_QT5=OFF diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index 87ca7b03c40..f432ade7dd1 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -27,6 +27,7 @@ set(OPENVDB_EXTRA_ARGS -DBoost_USE_STATIC_RUNTIME=OFF -DBOOST_ROOT=${LIBDIR}/boost -DBoost_NO_SYSTEM_PATHS=ON + -DBoost_NO_BOOST_CMAKE=ON -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/ -DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/ diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake index 92032719245..3532eec144e 100644 --- a/build_files/build_environment/cmake/osl.cmake +++ b/build_files/build_environment/cmake/osl.cmake @@ -44,6 +44,7 @@ set(OSL_EXTRA_ARGS -DBOOST_ROOT=${LIBDIR}/boost -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/ -DBoost_NO_SYSTEM_PATHS=ON + -DBoost_NO_BOOST_CMAKE=ON -DLLVM_DIRECTORY=${LIBDIR}/llvm -DLLVM_INCLUDES=${LIBDIR}/llvm/include -DLLVM_LIB_DIR=${LIBDIR}/llvm/lib diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake index 505607535e9..3e4535a6f92 100644 --- a/build_files/build_environment/cmake/usd.cmake +++ b/build_files/build_environment/cmake/usd.cmake @@ -22,6 +22,8 @@ set(USD_EXTRA_ARGS -DBoost_USE_STATIC_LIBS=ON -DBoost_USE_STATIC_RUNTIME=OFF -DBOOST_ROOT=${LIBDIR}/boost + -DBoost_NO_SYSTEM_PATHS=ON + -DBoost_NO_BOOST_CMAKE=ON -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT} -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT} |