fix CMakeLists.txt

Author: mircomarahrens

CMakeLists.txt

@@ -7,7 +7,7 @@
 # The full license is in the file LICENSE, distributed with this software. #
 ############################################################################
 
-cmake_minimum_required(VERSION 3.29)
+cmake_minimum_required(VERSION 3.14)
 project(xtensor-python)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
@@ -25,14 +25,14 @@ foreach(ver ${xtensor_python_version_defines})
         set(XTENSOR_PYTHON_VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}" CACHE INTERNAL "")
     endif()
 endforeach()
-set(${PROJECT_NAME}_VERSION
+set(${PROJECT_NAME}_VERSION 
     ${XTENSOR_PYTHON_VERSION_MAJOR}.${XTENSOR_PYTHON_VERSION_MINOR}.${XTENSOR_PYTHON_VERSION_PATCH})
 message(STATUS "xtensor-python v${${PROJECT_NAME}_VERSION}")
 
 # Dependencies
 # ============
 
-set(xtensor_REQUIRED_VERSION 0.26.0)
+set(xtensor_REQUIRED_VERSION 0.25.0)
 if(TARGET xtensor)
     set(xtensor_VERSION ${XTENSOR_VERSION_MAJOR}.${XTENSOR_VERSION_MINOR}.${XTENSOR_VERSION_PATCH})
     # Note: This is not SEMVER compatible comparison
@@ -46,27 +46,23 @@ else()
     message(STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS}/xtensor")
 endif()
 
-find_package(Python COMPONENTS Interpreter REQUIRED)
+# Running find_package(PythonInterp) to retrieve the Python version
+# which is not exported by Pybind11's cmake.
+# Cf. https://github.com/pybind/pybind11/issues/2268
+#find_package(PythonInterp ${PythonLibsNew_FIND_VERSION} REQUIRED)
+# the above line uses a deprecated cmake method, use the following instead
+find_package(Python COMPONENTS Interpreter Development.Module NumPy REQUIRED)
 
 set(pybind11_REQUIRED_VERSION 2.6.1)
-if (NOT TARGET pybind11::headers)
-    # Defaults to ON for cmake >= 3.18
-    # https://github.com/pybind/pybind11/blob/35ff42b56e9d34d9a944266eb25f2c899dbdfed7/CMakeLists.txt#L96
-    set(PYBIND11_FINDPYTHON OFF)
-    find_package(pybind11 ${pybind11_REQUIRED_VERSION} REQUIRED)
-    message(STATUS "Found pybind11: ${pybind11_INCLUDE_DIRS}/pybind11")
-else ()
+if(TARGET pybind11 OR TARGET pybind11::headers)
     # pybind11 has a variable that indicates its version already, so use that
     message(STATUS "Found pybind11 v${pybind11_VERSION}")
-endif ()
-
-# Look for NumPy headers, except if NUMPY_INCLUDE_DIRS is passed,
-# which is required under some circumstances (such as wasm, where
-# there is no real python executable)
-if(NOT NUMPY_INCLUDE_DIRS)
-    find_package(NumPy REQUIRED)
+else()
+    find_package(pybind11 ${pybind11_REQUIRED_VERSION} REQUIRED)
+    message(STATUS "Found pybind11: ${pybind11_INCLUDE_DIRS}/pybind11")
 endif()
-message(STATUS "Found numpy: ${NUMPY_INCLUDE_DIRS}")
+
+message(STATUS "Found numpy: ${Python_NumPy_INCLUDE_DIR}")
 
 # Build
 # =====
@@ -85,7 +81,7 @@ set(XTENSOR_PYTHON_HEADERS
 
 add_library(xtensor-python INTERFACE)
 target_include_directories(xtensor-python INTERFACE
-    "$<BUILD_INTERFACE:${XTENSOR_PYTHON_INCLUDE_DIR};${pybind11_INCLUDE_DIRS};${NUMPY_INCLUDE_DIRS}>"
+    "$<BUILD_INTERFACE:${XTENSOR_PYTHON_INCLUDE_DIR};${pybind11_INCLUDE_DIRS};${Python_NumPy_INCLUDE_DIR}>"
     $<INSTALL_INTERFACE:include>)
 target_link_libraries(xtensor-python INTERFACE xtensor)
 get_target_property(inc_dir xtensor-python INTERFACE_INCLUDE_DIRECTORIES)
@@ -124,12 +120,6 @@ export(EXPORT ${PROJECT_NAME}-targets
 install(FILES ${XTENSOR_PYTHON_HEADERS}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor-python)
 
-configure_file(${PROJECT_NAME}.pc.in
-               "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
-                @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
-        DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/")
-
 set(XTENSOR_PYTHON_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE
     STRING "install path for xtensor-pythonConfig.cmake")
 
@@ -152,4 +142,3 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
 install(EXPORT ${PROJECT_NAME}-targets
         FILE ${PROJECT_NAME}Targets.cmake
         DESTINATION ${XTENSOR_PYTHON_CMAKECONFIG_INSTALL_DIR})
-