From b93ddfd8ac565e536350de5699dddad09d0f407e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 16 Feb 2017 10:59:19 +0100 Subject: Alembic: force ALEMBIC_LIB_USES_BOOST=ON when not using C++11 Alembic requires one of ALEMBIC_LIB_USES_BOOST, ALEMBIC_LIB_USES_TR1, or C++11, and silently defaults to the latter if the former two are OFF. Before this change, Alembic was only built without C++11 of OpenEXR was built at the same time. This dependency was both unnecessary and undocumented. --- build_files/build_environment/install_deps.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index ed1b9a3e62a..08cb6822810 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2266,6 +2266,12 @@ compile_ALEMBIC() { cmake_d="-D CMAKE_INSTALL_PREFIX=$_inst" + # Without Boost or TR1, Alembic requires C++11. + if [ "$USE_CXX11" != true ]; then + cmake_d="$cmake_d -D ALEMBIC_LIB_USES_BOOST=ON" + cmake_d="$cmake_d -D ALEMBIC_LIB_USES_TR1=OFF" + fi + if [ -d $INST/boost ]; then cmake_d="$cmake_d -D BOOST_ROOT=$INST/boost" cmake_d="$cmake_d -D USE_STATIC_BOOST=ON" @@ -2285,8 +2291,6 @@ compile_ALEMBIC() { cmake_d="$cmake_d -D USE_STATIC_HDF5=OFF" cmake_d="$cmake_d -D ALEMBIC_ILMBASE_LINK_STATIC=OFF" cmake_d="$cmake_d -D ALEMBIC_SHARED_LIBS=OFF" - cmake_d="$cmake_d -D ALEMBIC_LIB_USES_BOOST=ON" - cmake_d="$cmake_d -D ALEMBIC_LIB_USES_TR1=OFF" INFO "ILMBASE_ROOT=$INST/openexr" fi -- cgit v1.2.3