Skip to content
Snippets Groups Projects
Commit f0d6b9c5 authored by AlQuemist's avatar AlQuemist
Browse files

rm Numpy from cmake/multipython/FindCustomPython3.cmake

parent b13fee57
No related branches found
No related tags found
1 merge request!2724Remove Numpy C-API from the build mechanism (Major change)
...@@ -11,7 +11,7 @@ function(find_custom_python3) ...@@ -11,7 +11,7 @@ function(find_custom_python3)
cmake_parse_arguments("_" "DEFAULT_PATH;VERBOSE" "PATHS" "" ${ARGN}) cmake_parse_arguments("_" "DEFAULT_PATH;VERBOSE" "PATHS" "" ${ARGN})
# if the version is already found and the variables are cached, then do nothing. # if the version is already found and the variables are cached, then do nothing.
if(Python3_FOUND AND Python3_Development_FOUND AND Python3_NumPy_FOUND) if(Python3_FOUND AND Python3_Development_FOUND)
return() return()
endif() endif()
...@@ -32,10 +32,10 @@ function(find_custom_python3) ...@@ -32,10 +32,10 @@ function(find_custom_python3)
# Python version. # Python version.
if(__DEFAULT_PATH) if(__DEFAULT_PATH)
find_package(Python3 3.${version_minor_min} REQUIRED find_package(Python3 3.${version_minor_min} REQUIRED
COMPONENTS Interpreter Development NumPy) COMPONENTS Interpreter Development)
else() else()
find_package(Python3 3.${version_minor_min} REQUIRED CONFIG find_package(Python3 3.${version_minor_min} REQUIRED CONFIG
COMPONENTS Interpreter Development NumPy COMPONENTS Interpreter Development
PATHS "${__PATHS}" NO_DEFAULT_PATH) PATHS "${__PATHS}" NO_DEFAULT_PATH)
endif() endif()
...@@ -45,13 +45,12 @@ function(find_custom_python3) ...@@ -45,13 +45,12 @@ function(find_custom_python3)
# store the exported parameters in the internal cache; # store the exported parameters in the internal cache;
# eg., with pytag 'py39', 'Python3_LIBRARY_DIRS_py39' will be exported, etc. # eg., with pytag 'py39', 'Python3_LIBRARY_DIRS_py39' will be exported, etc.
set(_exportPars Python3_FOUND Python3_Development_FOUND Python3_NumPy_FOUND set(_exportPars Python3_FOUND Python3_Development_FOUND
Python3_VERSION Python3_VERSION
Python3_VERSION_MAJOR Python3_VERSION_MINOR Python3_VERSION_PATCH Python3_VERSION_MAJOR Python3_VERSION_MINOR Python3_VERSION_PATCH
Python3_INCLUDE_DIRS Python3_LIBRARY_DIRS Python3_INCLUDE_DIRS Python3_LIBRARY_DIRS
Python3_SITELIB Python3_STDLIB Python3_SITELIB Python3_STDLIB
Python3_LIBRARIES Python3_LIBRARY_RELEASE Python3_EXECUTABLE Python3_LIBRARIES Python3_LIBRARY_RELEASE Python3_EXECUTABLE
Python3_NumPy_VERSION Python3_NumPy_INCLUDE_DIRS
) )
# Find Python3 DLL under Windows # Find Python3 DLL under Windows
...@@ -91,8 +90,6 @@ function(find_custom_python3) ...@@ -91,8 +90,6 @@ function(find_custom_python3)
message(STATUS " Python3_LIBRARY_DLL: ${Python3_LIBRARY_DLL}") message(STATUS " Python3_LIBRARY_DLL: ${Python3_LIBRARY_DLL}")
endif() endif()
message(STATUS " Python3_LIBRARY_DIRS: ${Python3_LIBRARY_DIRS}") message(STATUS " Python3_LIBRARY_DIRS: ${Python3_LIBRARY_DIRS}")
message(STATUS " Python3_NumPy_VERSION: ${Python3_NumPy_VERSION}")
message(STATUS " Python3_NumPy_INCLUDE_DIRS: ${Python3_NumPy_INCLUDE_DIRS}")
# if(Python3_FOUND) # if(Python3_FOUND)
# message(STATUS " Exported parameters: \{${_exportPars}\}") # message(STATUS " Exported parameters: \{${_exportPars}\}")
# endif() # endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment