Skip to content

Commit c5f9d96

Browse files
committed
Remove PYTHON_LIBRARY and PYTHON_INCLUDE_DIR force
1 parent 0e6d983 commit c5f9d96

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,13 @@ set(PYTHON_VERSION_RESET "${PYTHON_VERSION}")
9191
set(PYTHON_EXECUTABLE_RESET "${PYTHON_EXECUTABLE}")
9292
set(PYTHON_LIBRARIES_RESET "${PYTHON_LIBRARIES}")
9393
set(PYTHON_INCLUDE_DIRS_RESET "${PYTHON_INCLUDE_DIRS}")
94-
set(PYTHON_LIBRARY_RESET "${PYTHON_LIBRARY}")
95-
set(PYTHON_INCLUDE_DIR_RESET "${PYTHON_INCLUDE_DIR}")
9694

9795
# Change PYTHON_* vars before pybind11 find_package
9896
# to be sure that pybind11 relies on the right Python version
9997
set(PYTHON_VERSION "${Python_VERSION}" CACHE STRING "" FORCE)
10098
set(PYTHON_EXECUTABLE "${Python_EXECUTABLE}" CACHE FILEPATH "" FORCE)
10199
set(PYTHON_LIBRARIES "${Python_LIBRARIES}" CACHE STRING "" FORCE)
102100
set(PYTHON_INCLUDE_DIRS "${Python_INCLUDE_DIRS}" CACHE STRING "" FORCE)
103-
set(PYTHON_LIBRARY "${Python_LIBRARY}" CACHE INTERNAL "" FORCE)
104-
set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIR}" CACHE INTERNAL "" FORCE)
105101

106102
# Set the minimum pybind11 version to 2.3 (before that the pybind11::embed target did not exist)
107103
message("--- find_package(pybind11) ---")
@@ -113,8 +109,6 @@ set(PYTHON_VERSION "${PYTHON_VERSION_RESET}" CACHE STRING "" FORCE)
113109
set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_RESET}" CACHE FILEPATH "" FORCE)
114110
set(PYTHON_LIBRARIES "${PYTHON_LIBRARIES_RESET}" CACHE STRING "" FORCE)
115111
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS_RESET}" CACHE STRING "" FORCE)
116-
set(PYTHON_LIBRARY "${PYTHON_LIBRARY_RESET}" CACHE INTERNAL "" FORCE)
117-
set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR_RESET}" CACHE INTERNAL "" FORCE)
118112

119113
set(SP3_PYTHON_PACKAGES_DIRECTORY
120114
"python3/site-packages"

SofaPython3Config.cmake.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ set(PYTHON_VERSION_RESET "${PYTHON_VERSION}")
1717
set(PYTHON_EXECUTABLE_RESET "${PYTHON_EXECUTABLE}")
1818
set(PYTHON_LIBRARIES_RESET "${PYTHON_LIBRARIES}")
1919
set(PYTHON_INCLUDE_DIRS_RESET "${PYTHON_INCLUDE_DIRS}")
20-
set(PYTHON_LIBRARY_RESET "${PYTHON_LIBRARY}")
21-
set(PYTHON_INCLUDE_DIR_RESET "${PYTHON_INCLUDE_DIR}")
2220

2321
# Change PYTHON_* vars before pybind11 find_package
2422
# to be sure that pybind11 relies on the right Python version
2523
set(PYTHON_VERSION "${Python_VERSION}" CACHE STRING "" FORCE)
2624
set(PYTHON_EXECUTABLE "${Python_EXECUTABLE}" CACHE FILEPATH "" FORCE)
2725
set(PYTHON_LIBRARIES "${Python_LIBRARIES}" CACHE STRING "" FORCE)
2826
set(PYTHON_INCLUDE_DIRS "${Python_INCLUDE_DIRS}" CACHE STRING "" FORCE)
29-
set(PYTHON_LIBRARY "${Python_LIBRARY}" CACHE INTERNAL "" FORCE)
30-
set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIR}" CACHE INTERNAL "" FORCE)
3127

3228
# Set the minimum pybind11 version to 2.3 (before that the pybind11::embed target did not exist)
3329
find_package(pybind11 2.3 CONFIG QUIET REQUIRED)
@@ -37,8 +33,6 @@ set(PYTHON_VERSION "${PYTHON_VERSION_RESET}" CACHE STRING "" FORCE)
3733
set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_RESET}" CACHE FILEPATH "" FORCE)
3834
set(PYTHON_LIBRARIES "${PYTHON_LIBRARIES_RESET}" CACHE STRING "" FORCE)
3935
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS_RESET}" CACHE STRING "" FORCE)
40-
set(PYTHON_LIBRARY "${PYTHON_LIBRARY_RESET}" CACHE INTERNAL "" FORCE)
41-
set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR_RESET}" CACHE INTERNAL "" FORCE)
4236

4337
if(NOT SofaPython3_FIND_COMPONENTS)
4438
set(SofaPython3_FIND_COMPONENTS Plugin Bindings)

0 commit comments

Comments
 (0)