Bas Couwenberg pushed to branch upstream at Debian GIS Project / pdal
Commits:
88d96a54 by Bas Couwenberg at 2019-04-05T18:28:40Z
New upstream version 1.9~rc3+ds
- - - - -
1 changed file:
- cmake/python.cmake
Changes:
=====================================
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
@@ -13,18 +15,40 @@ if (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
# Since we've required 2.7, these should all be valid
set(PYTHON_LIBRARY ${Python2_LIBRARIES}
- CACHE FILEPATH "Python library")
+ CACHE FILEPATH "Python library")
set(PYTHON_INCLUDE_DIR ${Python2_INCLUDE_DIRS}
CACHE PATH "Location of Python include files")
set(PYTHON_NUMPY_INCLUDE_DIR ${Python2_NumPy_INCLUDE_DIRS}
CACHE PATH "Location of NumPy include files.")
else()
set(PYTHON_LIBRARY ${Python3_LIBRARIES}
- CACHE FILEPATH "Python library")
+ CACHE FILEPATH "Python library")
set(PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS}
- CACHE PATH "Location of Python include files.")
+ CACHE PATH "Location of Python include files.")
set(PYTHON_NUMPY_INCLUDE_DIR ${Python3_NumPy_INCLUDE_DIRS}
- CACHE PATH "Location of NumPy include files.")
+ 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()
View it on GitLab:
https://salsa.debian.org/debian-gis-team/pdal/commit/88d96a5490c8dc394417426e2d3c1e376a325caf
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/pdal/commit/88d96a5490c8dc394417426e2d3c1e376a325caf
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
