build_environment: alembic 1.7.8
authorRay Molenkamp <github@lazydodo.com>
Mon, 13 Aug 2018 17:35:58 +0000 (11:35 -0600)
committerRay Molenkamp <github@lazydodo.com>
Mon, 13 Aug 2018 17:36:23 +0000 (11:36 -0600)
build_files/build_environment/cmake/alembic.cmake
build_files/build_environment/cmake/harvest.cmake
build_files/build_environment/cmake/openexr.cmake
build_files/build_environment/cmake/versions.cmake

index cf2cefa2e7aee495172d4294fda152ad4f80c793..b6d7105c7c46611c09fda59a5cc135fff52d65ad 100644 (file)
@@ -40,10 +40,10 @@ set(ALEMBIC_EXTRA_ARGS
        -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${LIBEXT}
-       -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-       -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-       -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
+       -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half-2_3_s${LIBEXT}
+       -DALEMBIC_ILMBASE_IEXMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_3_s${LIBEXT}
+       -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_3_s${LIBEXT}
+       -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_3_s${LIBEXT}
        -DUSE_PYILMBASE=0
        -DUSE_PYALEMBIC=0
        -DUSE_ARNOLD=0
@@ -54,7 +54,7 @@ set(ALEMBIC_EXTRA_ARGS
        -DHDF5_ROOT=${LIBDIR}/hdf5
        -DUSE_TESTS=Off
        -DALEMBIC_NO_OPENGL=1
-       -DUSE_BINARIES=ON
+       -DUSE_BINARIES=OFF
        -DALEMBIC_ILMBASE_LINK_STATIC=On
        -DALEMBIC_SHARED_LIBS=OFF
        -DGLUT_INCLUDE_DIR=""
@@ -68,13 +68,32 @@ 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
 )
 
+if(WIN32)
+       if(BUILD_MODE STREQUAL Release)
+               ExternalProject_Add_Step(external_alembic after_install
+                       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic
+                       DEPENDEES install
+               )
+       endif()
+       if(BUILD_MODE STREQUAL Debug)
+               ExternalProject_Add_Step(external_alembic after_install
+                       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib &&
+                       DEPENDEES install
+               )
+       endif() 
+endif()
+
+
+
 add_dependencies(
        external_alembic
        external_boost
        external_zlib
        external_ilmbase
+       external_openexr
 )
index ece9716686fa11645527c21f438a65e3c601668e..4040f97df92bf2e9e1e6ce6b3b917cdf4a88b61d 100644 (file)
@@ -82,8 +82,6 @@ if(BUILD_MODE STREQUAL Release)
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/ &&
                                # opensubdiv
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv ${HARVEST_TARGET}/opensubdiv &&
-                               # alembic
-                               ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic &&
                                # BlendThumb
                                ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll &&
                                ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll &&
@@ -133,8 +131,6 @@ if(BUILD_MODE STREQUAL Debug)
                                ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib &&
                                # python
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
-                               # alembic
-                               ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib &&
                                # hdf5
                                ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
                                # numpy
index e7222478090d41ac8ed37a9ebb5f5c5c1e29ff2e..6c17f3ed580e879cad54127e320660cb33d3dd65 100644 (file)
 if(WIN32)
        set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
        set(OPENEXR_EXTRA_ARGS
-               -DBUILD_SHARED_LIBS=OFF
                -DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
                -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
                -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
                -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
                -DOPENEXR_BUILD_STATIC=On
+               -DOPENEXR_BUILD_SHARED=Off
                -DOPENEXR_BUILD_PYTHON_LIBS=Off
        )
        ExternalProject_Add(external_openexr
index 447bf82bfb4aa1583777d23fb874d7cb18a26045..4fd9ce4498eb101b4cadb99ea21c354963bd0371 100644 (file)
@@ -74,9 +74,9 @@ set(HDF5_VERSION 1.8.17)
 set(HDF5_URI https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${HDF5_VERSION}/src/hdf5-${HDF5_VERSION}.tar.gz)
 set(HDF5_HASH 7d572f8f3b798a628b8245af0391a0ca)
 
-set(ALEMBIC_VERSION 1.7.1)
-set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.zip)
-set(ALEMBIC_MD5 cf7705055501d5ea0cb8256866496f79)
+set(ALEMBIC_VERSION 1.7.8)
+set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
+set(ALEMBIC_MD5 d095c2feb5e183b824904db7b63c1d30)
 
 ## hash is for 3.1.2
 set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c)