Differential D11010 Diff 27158 files/Imath-instead-of-ilmbase.patch

Changeset View

Standalone View

				--- a/CMakeLists.txt
				+++ b/CMakeLists.txt
				@@ -341,9 +341,7 @@ if(OPENVDB_INSTALL_CMAKE_MODULES)
				set(OPENVDB_CMAKE_MODULES
				cmake/FindBlosc.cmake
				cmake/FindJemalloc.cmake
				- cmake/FindIlmBase.cmake
				cmake/FindLog4cplus.cmake
				- cmake/FindOpenEXR.cmake
				cmake/FindOpenVDB.cmake
				cmake/FindTBB.cmake
				cmake/OpenVDBGLFW3Setup.cmake
				--- a/openvdb/openvdb/CMakeLists.txt
				+++ b/openvdb/openvdb/CMakeLists.txt
				@@ -46,7 +46,6 @@ message(STATUS "------------------------
				# Collect and configure lib dependencies

				if(USE_EXR)
				- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED)
				find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED)
				if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_OPENEXR_VERSION)
				if(${OpenEXR_VERSION} VERSION_LESS FUTURE_MINIMUM_OPENEXR_VERSION)
				@@ -129,7 +128,7 @@ endif()
				set(OPENVDB_CORE_DEPENDENT_LIBS
				Boost::iostreams
				Boost::system
				- IlmBase::Half
				+ Imath::Imath
				)

				if(WIN32)
				@@ -147,10 +146,9 @@ endif()

				if(USE_EXR)
				list(APPEND OPENVDB_CORE_DEPENDENT_LIBS
				- IlmBase::IlmThread
				- IlmBase::Iex
				- IlmBase::Imath
				- OpenEXR::IlmImf
				+ OpenEXR::IlmThread
				+ OpenEXR::Iex
				+ Imath::Imath
				)
				endif()

				--- a/openvdb/openvdb/Types.h
				+++ b/openvdb/openvdb/Types.h
				@@ -7,7 +7,7 @@
				#include "version.h"
				#include "Platform.h"
				#include "TypeList.h" // backwards compat
				-#include <OpenEXR/half.h>
				+#include <Imath/half.h>
				#include <openvdb/math/Math.h>
				#include <openvdb/math/BBox.h>
				#include <openvdb/math/Quat.h>