diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-04 13:35:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-04 13:36:29 (GMT) |
| commit | 70d204410af9745181ca3f9bc5c80e059f606fa8 (patch) | |
| tree | 7329856991e6ca6c17c2559cefef8746726535c9 | |
| parent | dbd3b1ac90b70f31f10488a97ec72c6a435106ec (diff) | |
| parent | 8e3358336dba2af42279c16a277116fc8fdfb826 (diff) | |
| download | CMake-70d204410af9745181ca3f9bc5c80e059f606fa8.zip CMake-70d204410af9745181ca3f9bc5c80e059f606fa8.tar.gz CMake-70d204410af9745181ca3f9bc5c80e059f606fa8.tar.bz2 | |
Merge topic 'FindPython-NumPy-fix-include-dir'
8e3358336d FindPython: Fix NumPy component include directory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3053
| -rw-r--r-- | Modules/FindPython/Support.cmake | 3 | ||||
| -rw-r--r-- | Tests/FindPython/NumPy/arraytest.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 0138b04..ef8272c 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -1140,9 +1140,8 @@ if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS AND ${_PYTHON_PREFIX}_Inte OUTPUT_STRIP_TRAILING_WHITESPACE) if (NOT _${_PYTHON_PREFIX}_RESULT) find_path(${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR - NAMES arrayobject.h numpyconfig.h + NAMES "numpy/arrayobject.h" "numpy/numpyconfig.h" HINTS "${_${_PYTHON_PREFIX}_NumPy_PATH}" - PATH_SUFFIXES numpy NO_DEFAULT_PATH) endif() if(${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR) diff --git a/Tests/FindPython/NumPy/arraytest.c b/Tests/FindPython/NumPy/arraytest.c index 135877d..db259e5 100644 --- a/Tests/FindPython/NumPy/arraytest.c +++ b/Tests/FindPython/NumPy/arraytest.c @@ -1,7 +1,7 @@ #include "Python.h" #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION -#include "arrayobject.h" +#include "numpy/arrayobject.h" #include <math.h> |