Commit fe6a989
authored
Update FindNumPy.cmake
1 parent 9478947 commit fe6a989
1 file changed
Lines changed: 13 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -40,26 +40,26 @@ | |||
| 40 | 40 | ||
| 41 | 41 | # Finding NumPy involves calling the Python interpreter | |
| 42 | 42 | if(NumPy_FIND_REQUIRED) | |
| 43 | - find_package(PythonInterp REQUIRED) | ||
| 43 | + find_package(Python3 REQUIRED COMPONENTS Interpreter) | ||
| 44 | 44 | else() | |
| 45 | - find_package(PythonInterp) | ||
| 45 | + find_package(Python3 COMPONENTS Interpreter) | ||
| 46 | 46 | endif() | |
| 47 | 47 | ||
| 48 | 48 | if(NOT PYTHONINTERP_FOUND) | |
| 49 | 49 | set(NUMPY_FOUND FALSE) | |
| 50 | 50 | endif() | |
| 51 | 51 | ||
| 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) | ||
| 58 | 58 | ||
| 59 | 59 | if(NOT _NUMPY_SEARCH_SUCCESS MATCHES 0) | |
| 60 | 60 | if(NumPy_FIND_REQUIRED) | |
| 61 | 61 | message(FATAL_ERROR | |
| 62 | - "NumPy import failure:\n${_NUMPY_ERROR_VALUE}") | ||
| 62 | + "NumPy import failure:\n${_NUMPY_ERROR_VALUE}") | ||
| 63 | 63 | endif() | |
| 64 | 64 | set(NUMPY_FOUND FALSE) | |
| 65 | 65 | endif() | |
@@ -80,10 +80,10 @@ list(GET _NUMPY_VERSION_LIST 1 NUMPY_VERSION_MINOR) | |||
| 80 | 80 | list(GET _NUMPY_VERSION_LIST 2 NUMPY_VERSION_PATCH) | |
| 81 | 81 | string(REGEX MATCH "[0-9]*" NUMPY_VERSION_PATCH ${NUMPY_VERSION_PATCH}) | |
| 82 | 82 | 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}") | ||
| 84 | 84 | ||
| 85 | 85 | 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}") | ||
| 88 | 88 | ||
| 89 | - set(NUMPY_FOUND TRUE) | ||
| 89 | + set(NumPy_FOUND TRUE) | ||
0 commit comments