Commit: 920dff35dc3d7f6e9c90c6bcc4defa3c078b4204
Author: Ray Molenkamp
Date: Sat Aug 25 19:40:44 2018 -0600
Branches: master
https://developer.blender.org/rB920dff35dc3d7f6e9c90c6bcc4defa3c078b4204
build_environment: fix building openvdb on win32
===================================================================
M build_files/build_environment/cmake/openvdb.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/openvdb.cmake
b/build_files/build_environment/cmake/openvdb.cmake
index a9533a89b1b..a550ed5decb 100644
--- a/build_files/build_environment/cmake/openvdb.cmake
+++ b/build_files/build_environment/cmake/openvdb.cmake
@@ -60,6 +60,12 @@ if(WIN32)
-DOPENEXR_NAMESPACE_VERSIONING=OFF
-DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC2.lib
)
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+ set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+ -DCMAKE_SHARED_LINKER_FLAGS="/safeseh:no"
+ -DCMAKE_EXE_LINKER_FLAGS="/safeseh:no"
+ )
+ endif()
endif()
ExternalProject_Add(openvdb
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
