Teach pybind11 to find NumPy as a component

Author: mwoehlke-kitware

tools/pybind11Config.cmake.in

@@ -59,13 +59,14 @@ set(${PN}_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
 set(${PN}_LIBRARY "")
 set(${PN}_DEFINITIONS USING_${PN})
 
-check_required_components(${PN})
-
 # make detectable the FindPythonLibsNew.cmake module
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
 
 include(pybind11Tools)
 
+# Check for required components (note: found by pybind11Tools)
+check_required_components(${PN})
+
 if(NOT (CMAKE_VERSION VERSION_LESS 3.0))
 #-----------------------------------------------------------------------------
 # Don't include targets if this file is being picked up by another

tools/pybind11Tools.cmake

@@ -14,7 +14,23 @@ endif()
 
 set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
 find_package(PythonLibsNew ${PYBIND11_PYTHON_VERSION} REQUIRED)
-find_package(NumPy)
+if(pybind11_FIND_QUIETLY)
+  set(_pybind_find_quiet QUIET)
+else()
+  set(_pybind_find_quiet)
+endif()
+if(pybind11_FIND_COMPONENTS MATCHES NumPy)
+  if(pybind11_FIND_REQUIRED AND pybind11_FIND_REQUIRED_NumPy)
+    find_package(NumPy ${_pybind_find_quiet} REQUIRED)
+  else()
+    find_package(NumPy ${_pybind_find_quiet})
+    if(pybind11_FIND_REQUIRED_NumPy AND NOT NumPy_FOUND)
+      set(pybind11_NOT_FOUND_MESSAGE "pybind11 could not be found because required component NumPy could not be found.")
+      set(pybind11_FOUND False)
+    endif()
+  endif()
+  set(pybind11_NumPy_FOUND ${NumPy_FOUND})
+endif()
 
 include(CheckCXXCompilerFlag)
 include(CMakeParseArguments)