Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit fe6a989

Browse filesBrowse files
authored
Update FindNumPy.cmake
1 parent 9478947 commit fe6a989
Copy full SHA for fe6a989

1 file changed

+13-13Lines changed: 13 additions & 13 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎cmake/FindNumPy.cmake‎

Copy file name to clipboardExpand all lines: cmake/FindNumPy.cmake
+13-13Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,26 @@
4040

4141
# Finding NumPy involves calling the Python interpreter
4242
if(NumPy_FIND_REQUIRED)
43-
find_package(PythonInterp REQUIRED)
43+
find_package(Python3 REQUIRED COMPONENTS Interpreter)
4444
else()
45-
find_package(PythonInterp)
45+
find_package(Python3 COMPONENTS Interpreter)
4646
endif()
4747

4848
if(NOT PYTHONINTERP_FOUND)
4949
set(NUMPY_FOUND FALSE)
5050
endif()
5151

52-
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
53-
"import numpy as n; print(n.__version__); print(n.get_include());"
54-
RESULT_VARIABLE _NUMPY_SEARCH_SUCCESS
55-
OUTPUT_VARIABLE _NUMPY_VALUES
56-
ERROR_VARIABLE _NUMPY_ERROR_VALUE
57-
OUTPUT_STRIP_TRAILING_WHITESPACE)
52+
execute_process(COMMAND "${Python3_EXECUTABLE}" "-c"
53+
"import numpy as n; print(n.__version__); print(n.get_include());"
54+
RESULT_VARIABLE _NUMPY_SEARCH_SUCCESS
55+
OUTPUT_VARIABLE _NUMPY_VALUES
56+
ERROR_VARIABLE _NUMPY_ERROR_VALUE
57+
OUTPUT_STRIP_TRAILING_WHITESPACE)
5858

5959
if(NOT _NUMPY_SEARCH_SUCCESS MATCHES 0)
6060
if(NumPy_FIND_REQUIRED)
6161
message(FATAL_ERROR
62-
"NumPy import failure:\n${_NUMPY_ERROR_VALUE}")
62+
"NumPy import failure:\n${_NUMPY_ERROR_VALUE}")
6363
endif()
6464
set(NUMPY_FOUND FALSE)
6565
endif()
@@ -80,10 +80,10 @@ list(GET _NUMPY_VERSION_LIST 1 NUMPY_VERSION_MINOR)
8080
list(GET _NUMPY_VERSION_LIST 2 NUMPY_VERSION_PATCH)
8181
string(REGEX MATCH "[0-9]*" NUMPY_VERSION_PATCH ${NUMPY_VERSION_PATCH})
8282
math(EXPR NUMPY_VERSION_DECIMAL
83-
"(${NUMPY_VERSION_MAJOR} * 10000) + (${NUMPY_VERSION_MINOR} * 100) + ${NUMPY_VERSION_PATCH}")
83+
"(${NUMPY_VERSION_MAJOR} * 10000) + (${NUMPY_VERSION_MINOR} * 100) + ${NUMPY_VERSION_PATCH}")
8484

8585
find_package_message(NUMPY
86-
"Found NumPy: version \"${NUMPY_VERSION}\" ${NUMPY_INCLUDE_DIRS}"
87-
"${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")
86+
"Found NumPy: version \"${NUMPY_VERSION}\" ${NUMPY_INCLUDE_DIRS}"
87+
"${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}")
8888

89-
set(NUMPY_FOUND TRUE)
89+
set(NumPy_FOUND TRUE)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.