cmake/python.cmake

@@ -4,8 +4,10 @@
 
 #
 # Version 3.12 has shiny new FindPython2 and FindPython3 scripts
+# Version 3.14 introduces direct support for NumPy.
+# When we require newer cmake versions, ditch the older support.
 #
-if (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
+if (NOT (CMAKE_VERSION VERSION_LESS "3.14.0"))
     find_package(Python3 COMPONENTS Interpreter Development NumPy)
     if (NOT Python3_FOUND)
         find_package(Python2 2.7 REQUIRED EXACT
@@ -27,6 +29,28 @@ if (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
             CACHE PATH "Location of NumPy include files.")
     endif()
     set(PDAL_HAVE_PYTHON 1)
+elseif (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
+    find_package(Python3 COMPONENTS Interpreter Development)
+    if (NOT Python3_FOUND)
+        find_package(Python2 2.7 REQUIRED EXACT
+            COMPONENTS Interpreter Development)
+
+        # Since we've required 2.7, these should all be valid
+        set(PYTHON_LIBRARY ${Python2_LIBRARIES}
+            CACHE FILEPATH "Python library")
+        set(PYTHON_INCLUDE_DIR ${Python2_INCLUDE_DIRS}
+            CACHE PATH "Location of Python include files")
+        set(PYTHON_EXECUTABLE ${Python2_EXECUTABLE})
+        find_package(NumPy 1.5 REQUIRED)
+    else()
+        set(PYTHON_LIBRARY ${Python3_LIBRARIES}
+	        CACHE FILEPATH "Python library")
+        set(PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS}
+	        CACHE PATH "Location of Python include files.")
+         set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
+         find_package(NumPy 1.5 REQUIRED)
+    endif()
+    set(PDAL_HAVE_PYTHON 1)
 else()
     find_package(PythonInterp 3 QUIET)
     find_package(PythonLibs 3 QUIET)

debian/changelog

+pdal (1.9~rc3+ds-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Drop cmake-python3-numpy.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 05 Apr 2019 20:34:26 +0200
+
 pdal (1.9~rc2+ds-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.

debian/patches/cmake-python3-numpy.patch

-Description: Don't find Numpy component of Python{2,3}.
-Author: Bas Couwenberg <sebastic@debian.org>
-Bug: https://github.com/PDAL/PDAL/issues/2444
-
---- a/cmake/python.cmake
-+++ b/cmake/python.cmake
-@@ -6,10 +6,10 @@
- # Version 3.12 has shiny new FindPython2 and FindPython3 scripts
- #
- if (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
--    find_package(Python3 COMPONENTS Interpreter Development NumPy)
-+    find_package(Python3 COMPONENTS Interpreter Development)
-     if (NOT Python3_FOUND)
-         find_package(Python2 2.7 REQUIRED EXACT
--            COMPONENTS Interpreter Development NumPy)
-+            COMPONENTS Interpreter Development)
- 
-         # Since we've required 2.7, these should all be valid
-         set(PYTHON_LIBRARY ${Python2_LIBRARIES}
-@@ -18,13 +18,15 @@ if (NOT (CMAKE_VERSION VERSION_LESS "3.1
-             CACHE PATH "Location of Python include files")
-         set(PYTHON_NUMPY_INCLUDE_DIR ${Python2_NumPy_INCLUDE_DIRS}
-             CACHE PATH "Location of NumPy include files.")
-+        set(PYTHON_EXECUTABLE ${Python2_EXECUTABLE})
-+        find_package(NumPy 1.5 REQUIRED)
-     else()
-         set(PYTHON_LIBRARY ${Python3_LIBRARIES}
- 	    CACHE FILEPATH "Python library")
-         set(PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS}
- 	    CACHE PATH "Location of Python include files.")
--        set(PYTHON_NUMPY_INCLUDE_DIR ${Python3_NumPy_INCLUDE_DIRS}
--	    CACHE PATH "Location of NumPy include files.")
-+        set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
-+        find_package(NumPy 1.5 REQUIRED)
-     endif()
-     set(PDAL_HAVE_PYTHON 1)
- else()

debian/patches/series

@@ -2,4 +2,3 @@ privacy-breach.patch
 disable-sphinxcontrib-bibtex.patch
 use-mathjax-package.patch
 sphinx-DOCUMENTATION_OPTIONS-does-not-define-SOURCELINK_SUFFIX.patch
-cmake-python3-numpy.patch