Do not look for python (handled by pybind & invalid links on macOS)

Author: olivier-roussel

CMakeLists.txt

@@ -82,35 +82,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # Set the minimum python version to 3.7
 set(PYBIND11_PYTHON_VERSION 3.7)
 
-# Find Python3
-find_package(Python ${PYBIND11_PYTHON_VERSION} COMPONENTS Interpreter Development REQUIRED)
-
-# Save PYTHON_* vars
-set(PYTHON_VERSION_RESET "${PYTHON_VERSION}")
-set(PYTHON_EXECUTABLE_RESET "${PYTHON_EXECUTABLE}")
-set(PYTHON_LIBRARIES_RESET "${PYTHON_LIBRARIES}")
-set(PYTHON_INCLUDE_DIRS_RESET "${PYTHON_INCLUDE_DIRS}")
-set(PYTHON_LIBRARY_RESET "${PYTHON_LIBRARY}")
-set(PYTHON_INCLUDE_DIR_RESET "${PYTHON_INCLUDE_DIR}")
-
-# Change PYTHON_* vars before pybind11 find_package
-# to be sure that pybind11 relies on the right Python version
-set(PYTHON_VERSION "${Python_VERSION}" CACHE STRING "" FORCE)
-set(PYTHON_EXECUTABLE "${Python_EXECUTABLE}" CACHE FILEPATH "" FORCE)
-set(PYTHON_LIBRARIES "${Python_LIBRARIES}" CACHE STRING "" FORCE)
-set(PYTHON_INCLUDE_DIRS "${Python_INCLUDE_DIRS}" CACHE STRING "" FORCE)
-if(EXISTS "${Python_LIBRARY}")
-    set(PYTHON_LIBRARY "${Python_LIBRARY}" CACHE INTERNAL "" FORCE)
-elseif(EXISTS "${Python_LIBRARIES}")
-    set(PYTHON_LIBRARY "${Python_LIBRARIES}" CACHE INTERNAL "" FORCE)
-endif()
-if(EXISTS "${Python_INCLUDE_DIR}")
-    set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIR}" CACHE INTERNAL "" FORCE)
-elseif(EXISTS "${Python_INCLUDE_DIRS}")
-    set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE)
-endif()
-string(REGEX MATCH "[0-9]+\.[0-9]+" PythonMAJMIN "${Python_VERSION}")
-
 # Set the minimum pybind11 version to 2.3 (before that the pybind11::embed target did not exist)
 find_package(pybind11 2.3 CONFIG QUIET REQUIRED)
 
@@ -146,8 +117,6 @@ message(STATUS "Python:
     Libraries: ${Python_LIBRARIES}
     User site: ${PYTHON_USER_SITE}"
 )
-
-
 message(STATUS "pybind11:
     Version: ${pybind11_VERSION}
     Config: ${pybind11_CONFIG}"
@@ -246,11 +215,3 @@ if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_DIRECTORY)
         endif()
     endforeach()
 endif()
-
-# Reset PYTHON_* vars
-set(PYTHON_VERSION "${PYTHON_VERSION_RESET}" CACHE STRING "" FORCE)
-set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_RESET}" CACHE FILEPATH "" FORCE)
-set(PYTHON_LIBRARIES "${PYTHON_LIBRARIES_RESET}" CACHE STRING "" FORCE)
-set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS_RESET}" CACHE STRING "" FORCE)
-set(PYTHON_LIBRARY "${PYTHON_LIBRARY_RESET}" CACHE INTERNAL "" FORCE)
-set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR_RESET}" CACHE INTERNAL "" FORCE)

SofaPython3Config.cmake.in

@@ -8,47 +8,10 @@ set(SP3_PYTHON_PACKAGES_DIRECTORY @SP3_PYTHON_PACKAGES_DIRECTORY@)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 include(SofaPython3Tools)
 
-# Find Python3
-if(NOT Python_FOUND)
-    find_package(Python @PythonMAJMIN@ EXACT QUIET REQUIRED COMPONENTS Interpreter Development)
-endif()
 
 # Find pybind11
 if(NOT pybind11_FOUND)
-    # Save PYTHON_* vars
-    set(PYTHON_VERSION_RESET "${PYTHON_VERSION}")
-    set(PYTHON_EXECUTABLE_RESET "${PYTHON_EXECUTABLE}")
-    set(PYTHON_LIBRARIES_RESET "${PYTHON_LIBRARIES}")
-    set(PYTHON_INCLUDE_DIRS_RESET "${PYTHON_INCLUDE_DIRS}")
-    set(PYTHON_LIBRARY_RESET "${PYTHON_LIBRARY}")
-    set(PYTHON_INCLUDE_DIR_RESET "${PYTHON_INCLUDE_DIR}")
-
-    # Change PYTHON_* vars before pybind11 find_package
-    # to be sure that pybind11 relies on the right Python version
-    set(PYTHON_VERSION "${Python_VERSION}" CACHE STRING "" FORCE)
-    set(PYTHON_EXECUTABLE "${Python_EXECUTABLE}" CACHE FILEPATH "" FORCE)
-    set(PYTHON_LIBRARIES "${Python_LIBRARIES}" CACHE STRING "" FORCE)
-    set(PYTHON_INCLUDE_DIRS "${Python_INCLUDE_DIRS}" CACHE STRING "" FORCE)
-    if(EXISTS "${Python_LIBRARY}")
-        set(PYTHON_LIBRARY "${Python_LIBRARY}" CACHE INTERNAL "" FORCE)
-    elseif(EXISTS "${Python_LIBRARIES}")
-        set(PYTHON_LIBRARY "${Python_LIBRARIES}" CACHE INTERNAL "" FORCE)
-    endif()
-    if(EXISTS "${Python_INCLUDE_DIR}")
-        set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIR}" CACHE INTERNAL "" FORCE)
-    elseif(EXISTS "${Python_INCLUDE_DIRS}")
-        set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE)
-    endif()
-
     find_package(pybind11 @pybind11_VERSION@ QUIET REQUIRED CONFIG)
-
-    # Reset PYTHON_* vars
-    set(PYTHON_VERSION "${PYTHON_VERSION_RESET}" CACHE STRING "" FORCE)
-    set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_RESET}" CACHE FILEPATH "" FORCE)
-    set(PYTHON_LIBRARIES "${PYTHON_LIBRARIES_RESET}" CACHE STRING "" FORCE)
-    set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS_RESET}" CACHE STRING "" FORCE)
-    set(PYTHON_LIBRARY "${PYTHON_LIBRARY_RESET}" CACHE INTERNAL "" FORCE)
-    set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR_RESET}" CACHE INTERNAL "" FORCE)
 endif()
 
 # Find SofaPython3::XXXXX