build_environment: fix build issues with alembic
authorRay Molenkamp <github@lazydodo.com>
Sun, 19 Aug 2018 23:47:16 +0000 (17:47 -0600)
committerRay Molenkamp <github@lazydodo.com>
Sun, 19 Aug 2018 23:47:16 +0000 (17:47 -0600)
-read all headers from openexr not ilmbase
-add missing iexmath lib
-turn binaries back on, the blender unit tests require them.

build_files/build_environment/cmake/alembic.cmake

index 5ca142be124e09c8ea171ba6fee2375273c05dc3..245b5781216dc32cde142c4cc02d6c3a3a2a8c47 100644 (file)
@@ -38,12 +38,13 @@ set(ALEMBIC_EXTRA_ARGS
        -DBoost_DEBUG=ON
        -DBOOST_ROOT=${LIBDIR}/boost
        -DBoost_NO_SYSTEM_PATHS=ON
-       -DILMBASE_ROOT=${LIBDIR}/ilmbase
-       -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/ilmbase/include/OpenEXR
-       -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-       -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-       -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-       -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DILMBASE_ROOT=${LIBDIR}/openexr
+       -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/openexr/include/OpenEXR
+       -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+       -DALEMBIC_ILMBASE_IEXMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IexMath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
        -DUSE_PYILMBASE=0
        -DUSE_PYALEMBIC=0
        -DUSE_ARNOLD=0
@@ -54,7 +55,7 @@ set(ALEMBIC_EXTRA_ARGS
        -DHDF5_ROOT=${LIBDIR}/hdf5
        -DUSE_TESTS=Off
        -DALEMBIC_NO_OPENGL=1
-       -DUSE_BINARIES=OFF
+       -DUSE_BINARIES=ON
        -DALEMBIC_ILMBASE_LINK_STATIC=On
        -DALEMBIC_SHARED_LIBS=OFF
        -DGLUT_INCLUDE_DIR=""
@@ -68,7 +69,6 @@ ExternalProject_Add(external_alembic
        DOWNLOAD_DIR ${DOWNLOAD_DIR}
        URL_HASH MD5=${ALEMBIC_MD5}
        PREFIX ${BUILD_DIR}/alembic
-       PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/openexr/src/external_openexr/cmake ${BUILD_DIR}/alembic/src/external_alembic/cmake/modules
        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
        INSTALL_DIR ${LIBDIR}/alembic
 )