From f0d6b9c5468c9fe0538dbd9eba126afa8b0a5aca Mon Sep 17 00:00:00 2001 From: AlQuemist <alquemist@Lyriks> Date: Wed, 21 Aug 2024 11:49:45 +0200 Subject: [PATCH] rm Numpy from cmake/multipython/FindCustomPython3.cmake --- cmake/multipython/FindCustomPython3.cmake | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cmake/multipython/FindCustomPython3.cmake b/cmake/multipython/FindCustomPython3.cmake index 9e5a34d9b45..213e4b257c6 100644 --- a/cmake/multipython/FindCustomPython3.cmake +++ b/cmake/multipython/FindCustomPython3.cmake @@ -11,7 +11,7 @@ function(find_custom_python3) cmake_parse_arguments("_" "DEFAULT_PATH;VERBOSE" "PATHS" "" ${ARGN}) # 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() endif() @@ -32,10 +32,10 @@ function(find_custom_python3) # Python version. if(__DEFAULT_PATH) find_package(Python3 3.${version_minor_min} REQUIRED - COMPONENTS Interpreter Development NumPy) + COMPONENTS Interpreter Development) else() find_package(Python3 3.${version_minor_min} REQUIRED CONFIG - COMPONENTS Interpreter Development NumPy + COMPONENTS Interpreter Development PATHS "${__PATHS}" NO_DEFAULT_PATH) endif() @@ -45,13 +45,12 @@ function(find_custom_python3) # store the exported parameters in the internal cache; # 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_MAJOR Python3_VERSION_MINOR Python3_VERSION_PATCH Python3_INCLUDE_DIRS Python3_LIBRARY_DIRS Python3_SITELIB Python3_STDLIB Python3_LIBRARIES Python3_LIBRARY_RELEASE Python3_EXECUTABLE - Python3_NumPy_VERSION Python3_NumPy_INCLUDE_DIRS ) # Find Python3 DLL under Windows @@ -91,8 +90,6 @@ function(find_custom_python3) message(STATUS " Python3_LIBRARY_DLL: ${Python3_LIBRARY_DLL}") endif() 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) # message(STATUS " Exported parameters: \{${_exportPars}\}") # endif() -- GitLab