forked from bartvdbraak/blender
0a3b076961
Straight forward version bump, some of the variables to detect a static OpenEXR changed and the folder structure seemingly changed a little requiring updates to the diff Reviewed By: sebbas, sybren Differential Revision: https://developer.blender.org/D10340
121 lines
4.5 KiB
Diff
121 lines
4.5 KiB
Diff
diff -Naur openvdb-8.0.0/cmake/FindIlmBase.cmake openvdb/cmake/FindIlmBase.cmake
|
|
--- openvdb-8.0.0/cmake/FindIlmBase.cmake 2020-12-24 10:13:14 -0700
|
|
+++ openvdb/cmake/FindIlmBase.cmake 2021-02-05 12:07:49 -0700
|
|
@@ -217,6 +217,12 @@
|
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
|
|
endif()
|
|
list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES "${_IlmBase_Version_Suffix}.lib")
|
|
+ list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
|
|
+ "_s.lib"
|
|
+ )
|
|
+ list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
|
|
+ "_s_d.lib"
|
|
+ )
|
|
else()
|
|
if(ILMBASE_USE_STATIC_LIBS)
|
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
|
diff -Naur openvdb-8.0.0/cmake/FindOpenEXR.cmake openvdb/cmake/FindOpenEXR.cmake
|
|
--- openvdb-8.0.0/cmake/FindOpenEXR.cmake 2020-12-24 10:13:14 -0700
|
|
+++ openvdb/cmake/FindOpenEXR.cmake 2021-02-05 12:23:39 -0700
|
|
@@ -210,6 +210,12 @@
|
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
|
|
endif()
|
|
list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES "${_OpenEXR_Version_Suffix}.lib")
|
|
+ list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
|
|
+ "_s.lib"
|
|
+ )
|
|
+ list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES
|
|
+ "_s_d.lib"
|
|
+ )
|
|
else()
|
|
if(OPENEXR_USE_STATIC_LIBS)
|
|
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
|
|
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
|