diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-16 15:39:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-16 17:21:26 +0300 |
| commit | 42b7fb0fd365ecd683474ce06e859ae3a2e96e89 (patch) | |
| tree | baed8566f2d473d9357fa9ca1c3cd342133a75e9 /build_files/build_environment | |
| parent | 231d54e79b5008effb8dc8fa17210914a88f84fd (diff) | |
Build Environment: fix OpenVDB 5.1 build on Linux.
Diffstat (limited to 'build_files/build_environment')
| -rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 2 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/openvdb.cmake | 3 | ||||
| -rw-r--r-- | build_files/build_environment/patches/openvdb.diff | 20 |
3 files changed, 21 insertions, 4 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 86d207e7469..eaa32362028 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -168,7 +168,7 @@ harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h") harvest(openjpeg/lib openjpeg/lib "*.a") harvest(opensubdiv/include opensubdiv/include "*.h") harvest(opensubdiv/lib opensubdiv/lib "*.a") -harvest(openvdb/include/openvdb/openvdb openvdb/include/openvdb "*.h") +harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h") harvest(openvdb/lib openvdb/lib "*.a") harvest(osl/bin osl/bin "oslc") harvest(osl/include osl/include "*.h") diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index 9ef4a269c10..69dff9b2b57 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -32,8 +32,7 @@ set(OPENVDB_EXTRA_ARGS -DWITH_BLOSC=ON -DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/ -DBLOSC_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT} - -DOPENVDB_ABI_VERSION_NUMBER=3 - -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=Off + -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF -DOPENVDB_BUILD_UNITTESTS=Off -DOPENVDB_BUILD_PYTHON_MODULE=Off -DGLEW_LOCATION=${LIBDIR}/glew/ diff --git a/build_files/build_environment/patches/openvdb.diff b/build_files/build_environment/patches/openvdb.diff index 51d587b5a22..5d4c26c9527 100644 --- a/build_files/build_environment/patches/openvdb.diff +++ b/build_files/build_environment/patches/openvdb.diff @@ -16,7 +16,7 @@ diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt ) +if(NOT WIN32) -+ set(EXTRA_LIBS m stdc++) ++ set(EXTRA_LIBS m stdc++ dl) +endif() + TARGET_LINK_LIBRARIES ( vdb_print @@ -41,6 +41,15 @@ diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt ) SET ( VDB_VIEW_SOURCE_FILES +@@ -270,7 +270,7 @@ + PROPERTIES + COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1" + ) +-IF (NOT WIN32) ++IF (FALSE) + ADD_EXECUTABLE ( vdb_view + ${VDB_VIEW_SOURCE_FILES} + ) @@ -283,9 +288,8 @@ ${GLFW_LINK_LIBRARY} ${GLFW_DEPENDENT_LIBRARIES} @@ -63,6 +72,15 @@ diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt ) ADD_TEST ( vdb_unit_test vdb_test ) +@@ -422,7 +422,7 @@ + ENDIF () + + # Installation +-IF ( NOT WIN32 ) ++IF ( FALSE ) + INSTALL ( TARGETS + vdb_view + DESTINATION diff -Naur openvdb.orig/openvdb/math/Coord.h openvdb/openvdb/math/Coord.h --- openvdb.orig/openvdb/math/Coord.h 2018-04-10 12:22:17 -0600 +++ openvdb/openvdb/math/Coord.h 2018-08-15 20:32:43 -0600 |