Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
5c0ef417
Commit
5c0ef417
authored
Mar 04, 2019
by
Brad King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'FindPython-NumPy-fix-include-dir' into release-3.14
Merge-request:
!3053
parents
77439d97
8e335833
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
Modules/FindPython/Support.cmake
Modules/FindPython/Support.cmake
+1
-2
Tests/FindPython/NumPy/arraytest.c
Tests/FindPython/NumPy/arraytest.c
+1
-1
No files found.
Modules/FindPython/Support.cmake
View file @
5c0ef417
...
...
@@ -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
)
...
...
Tests/FindPython/NumPy/arraytest.c
View file @
5c0ef417
#include "Python.h"
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
#include "arrayobject.h"
#include "
numpy/
arrayobject.h"
#include <math.h>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment