mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 20:29:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

FindPython: Fix NumPy component include directory

Browse Source 
Update the component added by commit 513e77550d (FindPython: Introduce
NumPy component, 2018-12-12, v3.14.0-rc1~95^2).  The `numpy/`
sub-directory should not be part of the include directory.  It should be
part of the `#include` line.
This commit is contained in:
Marc Chevrier
2019-03-02 15:52:12 +01:00
committed by Brad King
parent 20a41aa589
commit 8e3358336d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindPython/Support.cmake
+1 -2
View File
@@ -1140,9 +1140,8 @@ if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS AND ${_PYTHON_PREFIX}_Inte
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
if (NOT _${_PYTHON_PREFIX}_RESULT) if (NOT _${_PYTHON_PREFIX}_RESULT)
find_path(${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR find_path(${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR
NAMES arrayobject.h numpyconfig.h NAMES "numpy/arrayobject.h" "numpy/numpyconfig.h"
HINTS "${_${_PYTHON_PREFIX}_NumPy_PATH}" HINTS "${_${_PYTHON_PREFIX}_NumPy_PATH}"
PATH_SUFFIXES numpy
NO_DEFAULT_PATH) NO_DEFAULT_PATH)
endif() endif()
if(${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR) if(${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR)
Tests/FindPython/NumPy/arraytest.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "Python.h" #include "Python.h"
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include "arrayobject.h" #include "numpy/arrayobject.h"
#include <math.h> #include <math.h>