Revert "Remove PYTHON_LIBRARY and PYTHON_INCLUDE_DIR force"

This reverts commit c5f9d96.

Author: guparan

CMakeLists.txt

@@ -89,13 +89,17 @@ 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)
+set(PYTHON_LIBRARY "${Python_LIBRARY}" CACHE INTERNAL "" FORCE)
+set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIR}" CACHE INTERNAL "" FORCE)
 
 # 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)
@@ -105,6 +109,8 @@ 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)
 
 set(SP3_PYTHON_PACKAGES_DIRECTORY
     "python3/site-packages"

SofaPython3Config.cmake.in

@@ -17,13 +17,17 @@ 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)
+set(PYTHON_LIBRARY "${Python_LIBRARY}" CACHE INTERNAL "" FORCE)
+set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIR}" CACHE INTERNAL "" FORCE)
 
 # 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)
@@ -33,6 +37,8 @@ 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)
 
 if(NOT SofaPython3_FIND_COMPONENTS)
     set(SofaPython3_FIND_COMPONENTS Plugin Bindings)