Fix finding numpy

lamyj · Sep 29, 2023 · 4133fb4 · 4133fb4
1 parent 09a259d
commit 4133fb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.ci/build/conda.py b/.ci/build/conda.py
@@ -5,5 +5,5 @@
 
 subprocess.check_call([
     conda, "install", "--yes", "-c", "conda-forge",
-    "boost", "boost-cpp", "cmake", "ninja", "numpy", "pybind11", "scipy",
+    "boost", "boost-cpp", "cmake", "make", "numpy", "pybind11", "scipy",
     "xsimd", "xtensor", "xtensor-python"])
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.14)
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.27)
     cmake_policy(SET CMP0148 NEW)
 endif()

diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt
@@ -2,7 +2,7 @@ if(NOT MSVC)
     set(XTENSOR_USE_XSIMD 1)
 endif()
 
-find_package(Python COMPONENTS Interpreter Development REQUIRED)
+find_package(Python COMPONENTS Interpreter Development Development.Module NumPy REQUIRED)
 find_package(pybind11 REQUIRED)
 find_package(xsimd REQUIRED)
 find_package(xtensor REQUIRED)
@@ -29,7 +29,8 @@ target_include_directories(
         ${CMAKE_SOURCE_DIR}/src ${PYTHON_INCLUDE_DIRS} ${xsimd_INCLUDE_DIRS}
         ${NUMPY_INCLUDE_DIR})
 
-target_link_libraries(pysycomore PUBLIC libsycomore xtensor xtensor-python)
+target_link_libraries(
+    pysycomore PUBLIC libsycomore Python::NumPy xtensor xtensor-python)
 
 set_target_properties(
     pysycomore PROPERTIES