Skip to content

Commit aadf5c1

Browse files
olivier-rousselolivier-roussel
committed
Do not look for python as this is handled by pybind tools
1 parent 4d238d2 commit aadf5c1

2 files changed

Lines changed: 33 additions & 69 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -82,34 +82,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
8282
# Set the minimum python version to 3.7
8383
set(PYBIND11_PYTHON_VERSION 3.7)
8484

85-
# Find Python3
86-
find_package(Python ${PYBIND11_PYTHON_VERSION} COMPONENTS Interpreter Development REQUIRED)
87-
88-
# Save PYTHON_* vars
89-
set(PYTHON_VERSION_RESET "${PYTHON_VERSION}")
90-
set(PYTHON_EXECUTABLE_RESET "${PYTHON_EXECUTABLE}")
91-
set(PYTHON_LIBRARIES_RESET "${PYTHON_LIBRARIES}")
92-
set(PYTHON_INCLUDE_DIRS_RESET "${PYTHON_INCLUDE_DIRS}")
93-
set(PYTHON_LIBRARY_RESET "${PYTHON_LIBRARY}")
94-
set(PYTHON_INCLUDE_DIR_RESET "${PYTHON_INCLUDE_DIR}")
95-
96-
# Change PYTHON_* vars before pybind11 find_package
97-
# to be sure that pybind11 relies on the right Python version
98-
set(PYTHON_VERSION "${Python_VERSION}" CACHE STRING "" FORCE)
99-
set(PYTHON_EXECUTABLE "${Python_EXECUTABLE}" CACHE FILEPATH "" FORCE)
100-
set(PYTHON_LIBRARIES "${Python_LIBRARIES}" CACHE STRING "" FORCE)
101-
set(PYTHON_INCLUDE_DIRS "${Python_INCLUDE_DIRS}" CACHE STRING "" FORCE)
102-
if(EXISTS "${Python_LIBRARY}")
103-
set(PYTHON_LIBRARY "${Python_LIBRARY}" CACHE INTERNAL "" FORCE)
104-
elseif(EXISTS "${Python_LIBRARIES}")
105-
set(PYTHON_LIBRARY "${Python_LIBRARIES}" CACHE INTERNAL "" FORCE)
106-
endif()
107-
if(EXISTS "${Python_INCLUDE_DIR}")
108-
set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIR}" CACHE INTERNAL "" FORCE)
109-
elseif(EXISTS "${Python_INCLUDE_DIRS}")
110-
set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE)
111-
endif()
112-
11385
# Set the minimum pybind11 version to 2.3 (before that the pybind11::embed target did not exist)
11486
find_package(pybind11 2.3 CONFIG QUIET REQUIRED)
11587

@@ -243,11 +215,3 @@ if (SP3_LINK_TO_USER_SITE AND SP3_PYTHON_PACKAGES_LINK_DIRECTORY)
243215
endif()
244216
endforeach()
245217
endif()
246-
247-
# Reset PYTHON_* vars
248-
set(PYTHON_VERSION "${PYTHON_VERSION_RESET}" CACHE STRING "" FORCE)
249-
set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_RESET}" CACHE FILEPATH "" FORCE)
250-
set(PYTHON_LIBRARIES "${PYTHON_LIBRARIES_RESET}" CACHE STRING "" FORCE)
251-
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS_RESET}" CACHE STRING "" FORCE)
252-
set(PYTHON_LIBRARY "${PYTHON_LIBRARY_RESET}" CACHE INTERNAL "" FORCE)
253-
set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR_RESET}" CACHE INTERNAL "" FORCE)

‎SofaPython3Config.cmake.in‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,46 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
99
include(SofaPython3Tools)
1010

1111
# Find Python3
12-
if(NOT Python_FOUND)
13-
find_package(Python @Python_VERSION@ QUIET REQUIRED COMPONENTS Interpreter Development)
14-
endif()
12+
#if(NOT Python_FOUND)
13+
# find_package(Python @Python_VERSION@ QUIET REQUIRED COMPONENTS Interpreter Development)
14+
#endif()
1515

1616
# Find pybind11
1717
if(NOT pybind11_FOUND)
18-
# Save PYTHON_* vars
19-
set(PYTHON_VERSION_RESET "${PYTHON_VERSION}")
20-
set(PYTHON_EXECUTABLE_RESET "${PYTHON_EXECUTABLE}")
21-
set(PYTHON_LIBRARIES_RESET "${PYTHON_LIBRARIES}")
22-
set(PYTHON_INCLUDE_DIRS_RESET "${PYTHON_INCLUDE_DIRS}")
23-
set(PYTHON_LIBRARY_RESET "${PYTHON_LIBRARY}")
24-
set(PYTHON_INCLUDE_DIR_RESET "${PYTHON_INCLUDE_DIR}")
18+
## Save PYTHON_* vars
19+
#set(PYTHON_VERSION_RESET "${PYTHON_VERSION}")
20+
#set(PYTHON_EXECUTABLE_RESET "${PYTHON_EXECUTABLE}")
21+
#set(PYTHON_LIBRARIES_RESET "${PYTHON_LIBRARIES}")
22+
#set(PYTHON_INCLUDE_DIRS_RESET "${PYTHON_INCLUDE_DIRS}")
23+
#set(PYTHON_LIBRARY_RESET "${PYTHON_LIBRARY}")
24+
#set(PYTHON_INCLUDE_DIR_RESET "${PYTHON_INCLUDE_DIR}")
2525

26-
# Change PYTHON_* vars before pybind11 find_package
27-
# to be sure that pybind11 relies on the right Python version
28-
set(PYTHON_VERSION "${Python_VERSION}" CACHE STRING "" FORCE)
29-
set(PYTHON_EXECUTABLE "${Python_EXECUTABLE}" CACHE FILEPATH "" FORCE)
30-
set(PYTHON_LIBRARIES "${Python_LIBRARIES}" CACHE STRING "" FORCE)
31-
set(PYTHON_INCLUDE_DIRS "${Python_INCLUDE_DIRS}" CACHE STRING "" FORCE)
32-
if(EXISTS "${Python_LIBRARY}")
33-
set(PYTHON_LIBRARY "${Python_LIBRARY}" CACHE INTERNAL "" FORCE)
34-
elseif(EXISTS "${Python_LIBRARIES}")
35-
set(PYTHON_LIBRARY "${Python_LIBRARIES}" CACHE INTERNAL "" FORCE)
36-
endif()
37-
if(EXISTS "${Python_INCLUDE_DIR}")
38-
set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIR}" CACHE INTERNAL "" FORCE)
39-
elseif(EXISTS "${Python_INCLUDE_DIRS}")
40-
set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE)
41-
endif()
26+
## Change PYTHON_* vars before pybind11 find_package
27+
## to be sure that pybind11 relies on the right Python version
28+
#set(PYTHON_VERSION "${Python_VERSION}" CACHE STRING "" FORCE)
29+
#set(PYTHON_EXECUTABLE "${Python_EXECUTABLE}" CACHE FILEPATH "" FORCE)
30+
#set(PYTHON_LIBRARIES "${Python_LIBRARIES}" CACHE STRING "" FORCE)
31+
#set(PYTHON_INCLUDE_DIRS "${Python_INCLUDE_DIRS}" CACHE STRING "" FORCE)
32+
#if(EXISTS "${Python_LIBRARY}")
33+
# set(PYTHON_LIBRARY "${Python_LIBRARY}" CACHE INTERNAL "" FORCE)
34+
#elseif(EXISTS "${Python_LIBRARIES}")
35+
# set(PYTHON_LIBRARY "${Python_LIBRARIES}" CACHE INTERNAL "" FORCE)
36+
#endif()
37+
#if(EXISTS "${Python_INCLUDE_DIR}")
38+
# set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIR}" CACHE INTERNAL "" FORCE)
39+
#elseif(EXISTS "${Python_INCLUDE_DIRS}")
40+
# set(PYTHON_INCLUDE_DIR "${Python_INCLUDE_DIRS}" CACHE INTERNAL "" FORCE)
41+
#endif()
4242

4343
find_package(pybind11 @pybind11_VERSION@ QUIET REQUIRED CONFIG)
4444

45-
# Reset PYTHON_* vars
46-
set(PYTHON_VERSION "${PYTHON_VERSION_RESET}" CACHE STRING "" FORCE)
47-
set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_RESET}" CACHE FILEPATH "" FORCE)
48-
set(PYTHON_LIBRARIES "${PYTHON_LIBRARIES_RESET}" CACHE STRING "" FORCE)
49-
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS_RESET}" CACHE STRING "" FORCE)
50-
set(PYTHON_LIBRARY "${PYTHON_LIBRARY_RESET}" CACHE INTERNAL "" FORCE)
51-
set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR_RESET}" CACHE INTERNAL "" FORCE)
45+
## Reset PYTHON_* vars
46+
#set(PYTHON_VERSION "${PYTHON_VERSION_RESET}" CACHE STRING "" FORCE)
47+
#set(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE_RESET}" CACHE FILEPATH "" FORCE)
48+
#set(PYTHON_LIBRARIES "${PYTHON_LIBRARIES_RESET}" CACHE STRING "" FORCE)
49+
#set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIRS_RESET}" CACHE STRING "" FORCE)
50+
#set(PYTHON_LIBRARY "${PYTHON_LIBRARY_RESET}" CACHE INTERNAL "" FORCE)
51+
#set(PYTHON_INCLUDE_DIR "${PYTHON_INCLUDE_DIR_RESET}" CACHE INTERNAL "" FORCE)
5252
endif()
5353

5454
# Find SofaPython3::XXXXX

0 commit comments

Comments
 (0)