cmake

jschueller · Dec 3, 2024 · 200edb0 · 200edb0
1 parent 1ec4b64
commit 200edb0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 97 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@
 # Benoit Scherrer, 2010 CRL, Harvard Medical School
 # Copyright (c) 2008-2009 Children's Hospital Boston
 #==============================================================================
-cmake_minimum_required (VERSION 3.13)
+cmake_minimum_required (VERSION 3.14)
 
 set (CMAKE_BUILD_TYPE Release CACHE STRING "Build type")
 
@@ -324,13 +324,9 @@ endif ()
 
 if (NLOPT_PYTHON)
   if (CMAKE_VERSION VERSION_LESS 3.26)
-    find_package (Python 3.6 COMPONENTS Interpreter Development)
+    find_package (Python 3.6 COMPONENTS Interpreter Development NumPy)
   else ()
-    find_package (Python 3.6 COMPONENTS Interpreter Development.Module Development.SABIModule)
-  endif ()
-
-  if (Python_FOUND)
-    find_package (NumPy)
+    find_package (Python 3.6 COMPONENTS Interpreter Development.Module Development.SABIModule NumPy)
   endif ()
 endif ()
 

diff --git a/cmake/FindNumPy.cmake b/cmake/FindNumPy.cmake
diff --git a/src/swig/CMakeLists.txt b/src/swig/CMakeLists.txt
@@ -19,17 +19,18 @@ endif ()
 include_directories (${NLOPT_PRIVATE_INCLUDE_DIRS})
 set_source_files_properties (nlopt.i PROPERTIES CPLUSPLUS ON)
 
-if (NUMPY_FOUND AND Python_FOUND)
+if (Python_NumPy_FOUND)
 
   set (SWIG_MODULE_nlopt_python_EXTRA_DEPS nlopt-python.i numpy.i generate-cpp)
 
   # swig_add_module is deprecated
   swig_add_library (nlopt_python LANGUAGE python SOURCES nlopt.i)
 
   target_include_directories (nlopt_python PRIVATE ${Python_INCLUDE_DIRS})
-  target_include_directories (nlopt_python PRIVATE ${NUMPY_INCLUDE_DIRS})
+  target_include_directories (nlopt_python PRIVATE ${Python_NumPy_INCLUDE_DIRS})
 
-  swig_link_libraries (nlopt_python ${nlopt_lib})
+  target_link_libraries (nlopt_python ${nlopt_lib})
+  target_link_libraries (nlopt_python Python::NumPy)
   if (TARGET Python::Module)
     target_link_libraries (nlopt_python Python::Module)
   else ()

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -62,7 +62,7 @@ foreach (algo_index RANGE 28) # 42
   endforeach ()
 endforeach ()
 
-if (Python_FOUND AND NUMPY_FOUND AND (SWIG_FOUND OR (EXISTS ${PROJECT_SOURCE_DIR}/src/swig/nlopt-python.cpp)))
+if (Python_NumPy_FOUND AND (SWIG_FOUND OR (EXISTS ${PROJECT_SOURCE_DIR}/src/swig/nlopt-python.cpp)))
   set (PYINSTALLCHECK_ENVIRONMENT "LD_LIBRARY_PATH=${PROJECT_BINARY_DIR}/src/swig"
                                   "PYTHONPATH=${PROJECT_BINARY_DIR}/src/swig"
     )