media-gfx/openvdb: remove version 5.1.0

2 files changed, 0 insertions, 420 deletions

diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch
deleted file mode 100644
index 791e05578729..000000000000
--- a/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
---- a/cmake/FindBlosc.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindBlosc.cmake	2018-08-07 21:01:16.869879255 +0100
-@@ -37,7 +37,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( BLOSC_LOCATION include/blosc.h
-+FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h
-   "$ENV{BLOSC_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -49,7 +49,7 @@
- 
- IF ( BLOSC_FOUND )
- 
--  SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
-+  SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-     CACHE STRING "Blosc library directories")
- 
-   SET ( _blosc_library_name "blosc" )
-@@ -75,6 +75,6 @@
-     SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
-   ENDIF()
- 
--  SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" )
-+  SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" )
- 
- ENDIF ( BLOSC_FOUND )
-diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
---- a/cmake/FindCPPUnit.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindCPPUnit.cmake	2018-08-07 21:02:15.421037954 +0100
-@@ -38,7 +38,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h
-+FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h
-   "$ENV{CPPUNIT_ROOT}"
-   NO_DEFAULT_PATH
-   NO_CMAKE_ENVIRONMENT_PATH
-@@ -53,13 +53,13 @@
- 
- IF ( CPPUNIT_FOUND )
-   
--  SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory")
-+  SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory")
-   IF (CPPUnit_USE_STATIC_LIBS)
- 	SET( CPPUNIT_LIBRARY_NAME libcppunit.a)
-   ELSE ()
- 	SET( CPPUNIT_LIBRARY_NAME cppunit)
-   ENDIF ()
-   FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME}
--	PATHS ${CPPUNIT_LOCATION}/lib )
-+	PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} )
-   
- ENDIF ( CPPUNIT_FOUND )
-diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
---- a/cmake/FindGLEW.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindGLEW.cmake	2018-08-07 21:04:32.804431135 +0100
-@@ -39,7 +39,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( GLEW_LOCATION include/GL/glew.h
-+FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h
-   "$ENV{GLEW_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -51,7 +51,7 @@
- 
- IF ( GLEW_LOCATION )
- 
--  SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path")
-+  SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path")
- 
-   SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-   IF (GLEW_USE_STATIC_LIBS)
-@@ -74,11 +74,11 @@
-       FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib )
- 	ELSE (APPLE)
-       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
--      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
--      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
-@@ -107,11 +107,11 @@
- 		)
- 	ELSE (APPLE)
- 	  # Unices
--      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
--      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
-diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
---- a/cmake/FindGLFW3.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindGLFW3.cmake	2018-08-07 21:07:24.458954825 +0100
-@@ -39,7 +39,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
-+FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h
-   "$ENV{GLFW3_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -50,9 +50,9 @@
-   )
- 
- IF (GLFW3_FOUND)
--  SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path")
-+  SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path")
-   IF (GLFW3_USE_STATIC_LIBS)
--    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw3  ${GLFW3_LOCATION}/lib
-+    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw3  ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 	  NO_DEFAULT_PATH
- 	  NO_CMAKE_ENVIRONMENT_PATH
- 	  NO_CMAKE_PATH
-@@ -60,7 +60,7 @@
- 	  NO_CMAKE_SYSTEM_PATH
- 	  )
-   ELSE (GLFW3_USE_STATIC_LIBS)
--    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw  ${GLFW3_LOCATION}/lib
-+    FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw  ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 	  NO_DEFAULT_PATH
- 	  NO_CMAKE_ENVIRONMENT_PATH
- 	  NO_CMAKE_PATH
-diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
---- a/cmake/FindGLFW.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindGLFW.cmake	2018-08-07 21:06:26.358774164 +0100
-@@ -38,12 +38,12 @@
- 
- SET ( GLFW_FOUND FALSE )
- 
--FIND_PATH( GLFW_LOCATION include/GL/glfw.h
-+FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h
-   "$ENV{GLFW_ROOT}"
-   NO_SYSTEM_ENVIRONMENT_PATH
-   )
- 
--SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path")
-+SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path")
- 
- SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF (GLFW_USE_STATIC_LIBS)
-@@ -61,7 +61,7 @@
-     FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib )
-   ELSE (APPLE)
-     SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
--    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       NO_DEFAULT_PATH
-       NO_SYSTEM_ENVIRONMENT_PATH
- 	  )
-@@ -84,7 +84,7 @@
-       )
-   ELSE (APPLE)
- 	# Unices
--    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       NO_SYSTEM_ENVIRONMENT_PATH
- 	  )
-   ENDIF (APPLE)
-diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
---- a/cmake/FindOpenVDB.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindOpenVDB.cmake	2018-08-07 21:10:41.640588458 +0100
-@@ -45,7 +45,7 @@
- 
- FIND_PACKAGE( PackageHandleStandardArgs )
- 
--FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h 
-+FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h 
-   "$ENV{OPENVDB_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -56,10 +56,10 @@
-   )
- 
- IF( OpenVDB_FOUND )
--  SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include
-+  SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}
-     CACHE PATH "OpenVDB include directory")
- 
--  SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib
-+  SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-     CACHE PATH "OpenVDB library directory" )
-   
-   FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb
-diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
---- a/cmake/FindTBB.cmake	2018-04-10 19:22:17.000000000 +0100
-+++ b/cmake/FindTBB.cmake	2018-08-07 21:11:48.477809067 +0100
-@@ -42,7 +42,7 @@
- 
- # SET ( TBB_FOUND FALSE )
- 
--FIND_PATH( TBB_LOCATION include/tbb/tbb.h
-+FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h
-   "$ENV{TBB_ROOT}"
-   NO_DEFAULT_PATH
-   NO_CMAKE_ENVIRONMENT_PATH
-@@ -57,7 +57,7 @@
- 
- IF ( TBB_FOUND )
- 
--  SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory")
-+  SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory")
- 
-   IF (APPLE)
- 	IF (TBB_FOR_CLANG)
-@@ -86,7 +86,7 @@
- 	LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} )
-   ELSE (APPLE)
- 	# MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
--    SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory")
-+    SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory")
- 	IF (${CMAKE_COMPILER_IS_GNUCXX})
- 	  IF ( TBB_MATCH_COMPILER_VERSION )
- 		STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
-diff -urN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2018-04-10 19:22:17.000000000 +0100
-+++ b/CMakeLists.txt	2018-08-07 20:59:54.149613568 +0100
-@@ -32,6 +32,8 @@
- 
- ENABLE_TESTING()
- 
-+INCLUDE ( GNUInstallDirs )
-+
- find_program(CCACHE_FOUND ccache)
- if(CCACHE_FOUND)
-     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2018-04-10 19:22:17.000000000 +0100
-+++ b/openvdb/CMakeLists.txt	2018-08-07 21:21:02.352705838 +0100
-@@ -414,7 +414,7 @@
-     )
- 
-   INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build  \"${PROJECT_BINARY_DIR}\" --target doc)")
--  INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
-+  INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR})
- 
- ENDIF ()
- 
-@@ -423,37 +423,37 @@
-   INSTALL ( TARGETS
-     vdb_view
-     DESTINATION
--    bin
-+    ${CMAKE_INSTALL_BINDIR}
-     )
- ENDIF ()
- INSTALL ( TARGETS
-   vdb_print
-   vdb_render
-   DESTINATION
--  bin
-+  ${CMAKE_INSTALL_BINDIR}
-   )
- 
- INSTALL ( TARGETS
-   openvdb_static
-   DESTINATION
--  lib
-+  ${CMAKE_INSTALL_LIBDIR}
-   )
- 
- IF (WIN32)
-   INSTALL ( TARGETS
- 	openvdb_shared
--	RUNTIME DESTINATION bin COMPONENT Runtime
--	ARCHIVE DESTINATION lib COMPONENT Runtime
-+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
-+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
- 	)
- ELSE()
-   INSTALL ( TARGETS
- 	openvdb_shared
- 	DESTINATION
--	lib
-+	${CMAKE_INSTALL_LIBDIR}
- 	)
- ENDIF ()
- 
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN "python" EXCLUDE
-   PATTERN "cmd" EXCLUDE
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2018-04-10 19:22:17.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-07 21:20:56.549685541 +0100
-@@ -54,10 +54,12 @@
-   pyVec3Grid.cc
-   )
- 
--SET ( PYOPENVDB_INSTALL_DIRECTORY
--  lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
--  CACHE STRING "The directory to install the pyopenvdb.so module."
--  )
-+IF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
-+  SET ( PYOPENVDB_INSTALL_DIRECTORY
-+    lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR}
-+    CACHE STRING "The directory to install the pyopenvdb.so module."
-+    )
-+ENDIF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
- 
- SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_PYTHON_MODULE_SOURCE_FILES}
-   PROPERTIES
-@@ -110,6 +112,6 @@
-   ${PYOPENVDB_INSTALL_DIRECTORY}
-   )       
- 
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-   FILES_MATCHING PATTERN "*.h"
-   )
diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch
deleted file mode 100644
index c2ecac0bf82d..000000000000
--- a/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2018-08-07 21:21:02.000000000 +0100
-+++ b/openvdb/CMakeLists.txt	2018-08-07 21:47:02.355277361 +0100
-@@ -83,11 +83,12 @@
-   ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
- ENDIF ()
- 
-+FIND_PACKAGE ( PkgConfig REQUIRED )
- FIND_PACKAGE ( Blosc REQUIRED )
- FIND_PACKAGE ( TBB REQUIRED )
- FIND_PACKAGE ( ZLIB REQUIRED )
--FIND_PACKAGE ( ILMBase REQUIRED )
--FIND_PACKAGE ( OpenEXR REQUIRED )
-+PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
- FIND_PACKAGE ( OpenGL REQUIRED )
- IF (OPENVDB_BUILD_DOCS)
-   FIND_PACKAGE ( Doxygen REQUIRED )
-@@ -111,8 +112,8 @@
-   INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} )
- ENDIF ()
- 
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} )
- 
- IF (WIN32)
-@@ -184,7 +185,7 @@
-   ${Boost_IOSTREAMS_LIBRARY}
-   ${Boost_SYSTEM_LIBRARY}
-   ${Tbb_TBB_LIBRARY}
--  ${Ilmbase_HALF_LIBRARY}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   ${ZLIB_LIBRARY}
-   ${BLOSC_blosc_LIBRARY}
-   )
-@@ -192,7 +193,7 @@
-   ${Boost_IOSTREAMS_LIBRARY}
-   ${Boost_SYSTEM_LIBRARY}
-   ${Tbb_TBB_LIBRARY}
--  ${Ilmbase_HALF_LIBRARY}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   ${ZLIB_LIBRARY}
-   ${BLOSC_blosc_LIBRARY}
-   )
-@@ -246,9 +247,8 @@
-   openvdb_shared
-   ${CMAKE_THREAD_LIBS_INIT}
-   ${BLOSC_blosc_LIBRARY}
--  ${Openexr_ILMIMF_LIBRARY}
--  ${Ilmbase_ILMTHREAD_LIBRARY}
--  ${Ilmbase_IEX_LIBRARY}
-+  ${OPENEXR_LIBS_LDFLAGS}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   m
-   stdc++
-   )
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2018-08-07 21:20:56.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-07 21:31:55.508016795 +0100
-@@ -9,8 +9,8 @@
- IF ( NOT OPENVDB_BUILD_CORE )
-   FIND_PACKAGE ( OpenVDB REQUIRED )
- 
--  FIND_PACKAGE ( ILMBase REQUIRED )
--  FIND_PACKAGE ( OpenEXR REQUIRED )
-+  PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+  PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
-   FIND_PACKAGE ( Blosc REQUIRED )
-   FIND_PACKAGE ( TBB REQUIRED )
-   FIND_PACKAGE ( ZLIB REQUIRED )
-@@ -29,8 +29,8 @@
-   SET ( OPENVDB_LIB openvdb_shared)
- ENDIF ( NOT OPENVDB_BUILD_CORE )
- 
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
-@@ -96,7 +96,7 @@
-   ${GLEW_GLEW_LIBRARY}
-   ${Boost_PYTHON_LIBRARY}
-   ${PYTHON_LIBRARY}
--  ${Ilmbase_HALF_LIBRARY}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   )
- 
- SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES