Build Environment: fix OpenVDB 5.1 build on Linux.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 16 Aug 2018 12:39:05 +0000 (14:39 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 16 Aug 2018 14:21:26 +0000 (16:21 +0200)
build_files/build_environment/cmake/harvest.cmake
build_files/build_environment/cmake/openvdb.cmake
build_files/build_environment/patches/openvdb.diff

index 86d207e74690c6820d785d9f519e3a7c8b375c6f..eaa32362028ef069b8015cfcc94cd9af092583a0 100644 (file)
@@ -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")
index 9ef4a269c10ba66648b8dfbcb4bcb4fb28a0e5ec..69dff9b2b5750e6be88d7a65555539f807b6b8f2 100644 (file)
@@ -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/
index 51d587b5a22aa81c3bbc41090db85e2a5c7b7511..5d4c26c95271172bf37e8c7f18c02f7783411826 100644 (file)
@@ -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