diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-04 13:28:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-04 13:28:56 (GMT) |
| commit | 5c0ef417b8a85546e50f7107b0038cbb7d108d20 (patch) | |
| tree | 8e46de1663bbaa71802fab849da0d08f1d4b1ff8 | |
| parent | 77439d97fe66804f4cb69792bec5cbb6f5bb6e93 (diff) | |
| parent | 8e3358336dba2af42279c16a277116fc8fdfb826 (diff) | |
| download | CMake-5c0ef417b8a85546e50f7107b0038cbb7d108d20.zip CMake-5c0ef417b8a85546e50f7107b0038cbb7d108d20.tar.gz CMake-5c0ef417b8a85546e50f7107b0038cbb7d108d20.tar.bz2 | |
Merge branch 'FindPython-NumPy-fix-include-dir' into release-3.14
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> |