From 5a05543414551c169a27ec629799b12a25014fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jani=20V=C3=A4limaa?= <wally@mageia.org>
Date: Sun, 23 Sep 2018 16:17:03 +0300
Subject: [PATCH] openvdb/python/CMakeLists.txt: Fix build with CMake >= 3.12

---
 openvdb/python/CMakeLists.txt | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
index f4253c0..fb63567 100644
--- a/openvdb/python/CMakeLists.txt
+++ b/openvdb/python/CMakeLists.txt
@@ -1,9 +1,8 @@
 
 PROJECT ( PyOpenVDB )
 
-FIND_PACKAGE ( PythonInterp REQUIRED )
-FIND_PACKAGE ( PythonLibs REQUIRED )
-FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} )
+FIND_PACKAGE ( Python REQUIRED COMPONENTS Interpreter Development )
+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${Python_VERSION_MAJOR} )
 
 
 IF ( NOT OPENVDB_BUILD_CORE )
@@ -35,7 +34,7 @@ INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} )
-INCLUDE_DIRECTORIES ( SYSTEM ${PYTHON_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES ( SYSTEM ${Python_INCLUDE_DIR} )
 # MESSAGE ( "PYTHON_VERSION_STRING = ${PYTHON_VERSION_STRING}" )
 
 # MESSAGE ( "PYTHON_VERSION_MAJOR = ${PYTHON_VERSION_MAJOR}" )
@@ -51,7 +50,7 @@ SET ( OPENVDB_PYTHON_MODULE_SOURCE_FILES
 
 IF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
   SET ( PYOPENVDB_INSTALL_DIRECTORY
-    lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
+    lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}
     CACHE STRING "The directory to install the pyopenvdb.so module."
     )
 ENDIF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY )
@@ -89,8 +88,8 @@ TARGET_LINK_LIBRARIES ( pyopenvdb
   ${GLFW_LINK_LIBRARY}
   ${GLFW_DEPENDENT_LIBRARIES}
   ${GLEW_GLEW_LIBRARY}
-  ${Boost_PYTHON_LIBRARY}
-  ${PYTHON_LIBRARY}
+  Boost::python${Python_VERSION_MAJOR}
+  ${Python_LIBRARIES}
   ${Ilmbase_HALF_LIBRARY}
   )
 
@@ -98,7 +97,7 @@ SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES
   PREFIX ""
   )
 
-ADD_TEST ( pytest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/TestOpenVDB.py )
+ADD_TEST ( pytest ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/TestOpenVDB.py )
 SET_TESTS_PROPERTIES ( pytest PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}")
 
 INSTALL ( TARGETS
-- 
2.19.0