forked from blender/blender
Ray molenkamp
b9c37608a9
This only updates the build system, precompiled libraries for the various platforms will be committed over the coming week. New: fmt 8.0.0 level_zero v1.7.15 pystring v1.1.3 robinmap v0.6.2 webp 1.2.2 Updated: alembic 1.8.3 blosc 1.21.1 boost 1.78.0 embree 3.13.3 ffmpeg 5.0 fftw 3.3.10 flac 1.3.4 imath 3.1.4 ispc v1.17.0 jpeg 2.1.3 ogg 1.3.5 oidn 1.4.3 openal 1.21.1 opencolorio 2.1.1 openexr 3.1.4 openimageio v2.3.13.0 openjpeg 2.4.0 opensubdiv v3_4_4 openvdb 9.0.0 osl 1.11.17.0 sdl 2.0.20 tbb 2020_u3 tiff 4.3.0 usd 22.03 vorbis 1.3.7 vpx 1.11.0 x264 35fe20d1b zlib 1.2.12 Implemented by Ray Molenkamp, Sybren Stüvel and Brecht Van Lommel. Ref T95206
102 lines
4.0 KiB
Diff
102 lines
4.0 KiB
Diff
diff -ur openvdb-9.0.0/cmake/FindTBB.cmake openvdb/cmake/FindTBB.cmake
|
|
--- openvdb-9.0.0/cmake/FindTBB.cmake 2021-10-30 03:55:40.000000000 +0100
|
|
+++ openvdb/cmake/FindTBB.cmake 2022-03-31 11:33:15.592329750 +0100
|
|
@@ -252,7 +252,8 @@
|
|
set(_TBB_LIB_NAME "${_TBB_LIB_NAME}${TBB_DEBUG_SUFFIX}")
|
|
endif()
|
|
|
|
- find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE} ${_TBB_LIB_NAME}
|
|
+ find_library(Tbb_${COMPONENT}_LIBRARY_${BUILD_TYPE}
|
|
+ NAMES ${_TBB_LIB_NAME} ${_TBB_LIB_NAME}_static
|
|
${_FIND_TBB_ADDITIONAL_OPTIONS}
|
|
PATHS ${_TBB_LIBRARYDIR_SEARCH_DIRS}
|
|
PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR} lib64 lib
|
|
diff -Naur openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt openvdb/openvdb/openvdb/CMakeLists.txt
|
|
--- openvdb-8.0.0/openvdb/openvdb/CMakeLists.txt 2020-12-24 10:13:14 -0700
|
|
+++ openvdb/openvdb/openvdb/CMakeLists.txt 2021-02-05 11:18:33 -0700
|
|
@@ -107,7 +107,9 @@
|
|
# http://boost.2283326.n4.nabble.com/CMake-config-scripts-broken-in-1-70-td4708957.html
|
|
# https://github.com/boostorg/boost_install/commit/160c7cb2b2c720e74463865ef0454d4c4cd9ae7c
|
|
set(BUILD_SHARED_LIBS ON)
|
|
- set(Boost_USE_STATIC_LIBS OFF)
|
|
+ if(NOT WIN32) # blender links boost statically on windows
|
|
+ set(Boost_USE_STATIC_LIBS OFF)
|
|
+ endif()
|
|
endif()
|
|
|
|
find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system)
|
|
@@ -146,6 +148,7 @@
|
|
Boost::disable_autolinking # add -DBOOST_ALL_NO_LIB
|
|
)
|
|
endif()
|
|
+ add_definitions(-D__TBB_NO_IMPLICIT_LINKAGE -DOPENVDB_OPENEXR_STATICLIB)
|
|
endif()
|
|
|
|
if(USE_EXR)
|
|
@@ -379,7 +382,12 @@
|
|
# imported targets.
|
|
|
|
if(OPENVDB_CORE_SHARED)
|
|
- add_library(openvdb_shared SHARED ${OPENVDB_LIBRARY_SOURCE_FILES})
|
|
+ if(WIN32)
|
|
+ configure_file(version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
|
|
+ add_library(openvdb_shared SHARED ${OPENVDB_LIBRARY_SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
|
|
+ else()
|
|
+ add_library(openvdb_shared SHARED ${OPENVDB_LIBRARY_SOURCE_FILES})
|
|
+ endif()
|
|
endif()
|
|
|
|
if(OPENVDB_CORE_STATIC)
|
|
diff -Naur openvdb-8.0.0/openvdb/openvdb/version.rc.in openvdb/openvdb/openvdb/version.rc.in
|
|
--- openvdb-8.0.0/openvdb/openvdb/version.rc.in 1969-12-31 17:00:00 -0700
|
|
+++ openvdb/openvdb/openvdb/version.rc.in 2021-02-05 11:18:33 -0700
|
|
@@ -0,0 +1,48 @@
|
|
+#include <winver.h>
|
|
+
|
|
+#define VER_FILEVERSION @OpenVDB_MAJOR_VERSION@,@OpenVDB_MINOR_VERSION@,@OpenVDB_PATCH_VERSION@,0
|
|
+#define VER_FILEVERSION_STR "@OpenVDB_MAJOR_VERSION@.@OpenVDB_MINOR_VERSION@.@OpenVDB_PATCH_VERSION@.0\0"
|
|
+
|
|
+#define VER_PRODUCTVERSION @OpenVDB_MAJOR_VERSION@,@OpenVDB_MINOR_VERSION@,@OpenVDB_PATCH_VERSION@,0
|
|
+#define VER_PRODUCTVERSION_STR "@OpenVDB_MAJOR_VERSION@.@OpenVDB_MINOR_VERSION@\0"
|
|
+
|
|
+#ifndef DEBUG
|
|
+#define VER_DEBUG 0
|
|
+#else
|
|
+#define VER_DEBUG VS_FF_DEBUG
|
|
+#endif
|
|
+
|
|
+VS_VERSION_INFO VERSIONINFO
|
|
+FILEVERSION VER_FILEVERSION
|
|
+PRODUCTVERSION VER_PRODUCTVERSION
|
|
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
|
|
+FILEFLAGS (VER_DEBUG)
|
|
+FILEOS VOS__WINDOWS32
|
|
+FILETYPE VFT_DLL
|
|
+FILESUBTYPE VFT2_UNKNOWN
|
|
+BEGIN
|
|
+ BLOCK "StringFileInfo"
|
|
+ BEGIN
|
|
+ BLOCK "040904E4"
|
|
+ BEGIN
|
|
+ VALUE "FileDescription", "OpenVDB"
|
|
+ VALUE "FileVersion", VER_FILEVERSION_STR
|
|
+ VALUE "InternalName", "OpenVDB"
|
|
+ VALUE "ProductName", "OpenVDB"
|
|
+ VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
|
+ END
|
|
+ END
|
|
+
|
|
+ BLOCK "VarFileInfo"
|
|
+ BEGIN
|
|
+ /* The following line should only be modified for localized versions. */
|
|
+ /* It consists of any number of WORD,WORD pairs, with each pair */
|
|
+ /* describing a language,codepage combination supported by the file. */
|
|
+ /* */
|
|
+ /* For example, a file might have values "0x409,1252" indicating that it */
|
|
+ /* supports English language (0x409) in the Windows ANSI codepage (1252). */
|
|
+
|
|
+ VALUE "Translation", 0x409, 1252
|
|
+
|
|
+ END
|
|
+END
|