Refactored NumPy detection.

Most importantly, added support for multiple include directores,
but also did some general cleanup.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db1b685c9280d907fa3d833438b9352e9d388c2a..29fdc4eca96080bb994fe6097255f4cf3dbd291a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -814,8 +814,8 @@ if(BUILD_opencv_python)
   else()
     status("    Libraries:"   HAVE_opencv_python  THEN  "${PYTHON_LIBRARIES}"                                      ELSE NO)
   endif()
-  status("    numpy:"         PYTHON_NUMPY_INCLUDE_DIR THEN "${PYTHON_NUMPY_INCLUDE_DIR} (ver ${PYTHON_NUMPY_VERSION})" ELSE "NO (Python wrappers can not be generated)")
-  status("    packages path:" PYTHON_EXECUTABLE        THEN "${PYTHON_PACKAGES_PATH}"                                   ELSE "-")
+  status("    numpy:"         PYTHON_NUMPY_INCLUDE_DIRS THEN "${PYTHON_NUMPY_INCLUDE_DIRS} (ver ${PYTHON_NUMPY_VERSION})" ELSE "NO (Python wrappers can not be generated)")
+  status("    packages path:" PYTHON_EXECUTABLE         THEN "${PYTHON_PACKAGES_PATH}"                                    ELSE "-")
 endif()
 
 # ========================== java ==========================

diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
index fa88ba0dcfe951f3e583dac889e2db9ef59df501..8630a82da713c44eb42b4fa497d90ced6eb4d91b 100644 (file)
--- a/cmake/OpenCVDetectPython.cmake
+++ b/cmake/OpenCVDetectPython.cmake
@@ -54,24 +54,24 @@ if(PYTHONINTERP_FOUND)
     endif()
     SET(PYTHON_PACKAGES_PATH "${_PYTHON_PACKAGES_PATH}" CACHE PATH "Where to install the python packages.")
 
-    if(NOT PYTHON_NUMPY_INCLUDE_DIR)
+    if(NOT PYTHON_NUMPY_INCLUDE_DIRS)
       # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
-      execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(numpy.distutils.misc_util.get_numpy_include_dirs()[0])"
+      execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c
+                        "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
                       RESULT_VARIABLE PYTHON_NUMPY_PROCESS
-                      OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIR
+                      OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIRS
                       OUTPUT_STRIP_TRAILING_WHITESPACE)
 
       if(PYTHON_NUMPY_PROCESS EQUAL 0)
-        file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIR}" _PYTHON_NUMPY_INCLUDE_DIR)
-        set(PYTHON_NUMPY_INCLUDE_DIR ${_PYTHON_NUMPY_INCLUDE_DIR} CACHE PATH "Path to numpy headers")
+        file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIRS}" _PYTHON_NUMPY_INCLUDE_DIRS)
+        set(PYTHON_NUMPY_INCLUDE_DIRS "${_PYTHON_NUMPY_INCLUDE_DIRS}" CACHE PATH "Path to numpy headers")
       endif()
     endif()
 
-    if(PYTHON_NUMPY_INCLUDE_DIR)
-      execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import numpy; print(numpy.version.version)"
-                        RESULT_VARIABLE PYTHON_NUMPY_PROCESS
-                        OUTPUT_VARIABLE PYTHON_NUMPY_VERSION
-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(PYTHON_NUMPY_INCLUDE_DIRS)
+      execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import numpy; print(numpy.version.version)"
+                      OUTPUT_VARIABLE PYTHON_NUMPY_VERSION
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
     endif()
   endif(NOT ANDROID AND NOT IOS)
 

diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt
index 877b4541743444d0a3238ad2d189ed4357fa641f..d3bed1695bfa1ded252ca2ed6771d95e7d190e9d 100644 (file)
--- a/modules/python/CMakeLists.txt
+++ b/modules/python/CMakeLists.txt
@@ -6,7 +6,7 @@ if(WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
   ocv_module_disable(python)
 endif()
 
-if(ANDROID OR IOS OR NOT PYTHONLIBS_FOUND OR NOT PYTHON_NUMPY_INCLUDE_DIR)
+if(ANDROID OR IOS OR NOT PYTHONLIBS_FOUND OR NOT PYTHON_NUMPY_INCLUDE_DIRS)
   ocv_module_disable(python)
 endif()
 
@@ -15,7 +15,7 @@ ocv_add_module(python BINDINGS opencv_core opencv_flann opencv_imgproc opencv_vi
 
 ocv_module_include_directories(
     "${PYTHON_INCLUDE_PATH}"
-    "${PYTHON_NUMPY_INCLUDE_DIR}"
+    ${PYTHON_NUMPY_INCLUDE_DIRS}
     "${CMAKE_CURRENT_SOURCE_DIR}/src2"
     )