diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index 1a91bde8fd1716ccbce1fbdb14c640586e7c51d4..0c17d46da86956a781fc0d4bc202b92dd3bddf76 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -100,7 +100,7 @@ if(OGS_BUILD_PYTHON_MODULE AND NOT (WIN32 AND "${CMAKE_BUILD_TYPE}" STREQUAL
add_test(
NAME ogs_python_module
COMMAND
- ${Python3_EXECUTABLE}
+ ${Python_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/ogs_python_module.py
${CMAKE_SOURCE_DIR}/Tests/Data/Parabolic/LiquidFlow/Flux/cube_1e3_calculatesurfaceflux.prj
)
diff --git a/InfoLib/CMakeInfo.cpp.in b/InfoLib/CMakeInfo.cpp.in
index 8c2c7b4d21ef2033066fc9f020e0722296f231a9..fd79cb27eac032f0b9da6d3f2f569c3ed2caf702 100644
--- a/InfoLib/CMakeInfo.cpp.in
+++ b/InfoLib/CMakeInfo.cpp.in
@@ -17,7 +17,7 @@ namespace CMakeInfoLib
namespace CMakeInfo
{
- const std::string python_virtualenv_sitepackages("@Python3_VIRTUALENV_SITEPACKAGES@");
- const std::string cmake_args("@CMAKE_ARGS_ESCAPED@");
-}
-}
+const std::string python_virtualenv_sitepackages("@Python_SITEARCH@");
+const std::string cmake_args("@CMAKE_ARGS_ESCAPED@");
+} // namespace CMakeInfo
+} // namespace CMakeInfoLib
diff --git a/ProcessLib/BoundaryConditionAndSourceTerm/Python/CMakeLists.txt b/ProcessLib/BoundaryConditionAndSourceTerm/Python/CMakeLists.txt
index bc4430e177b1b05513a588e2339d00e59f15f7b7..32dacb9701eb2d15c1180b291a476bebb7c97231 100644
--- a/ProcessLib/BoundaryConditionAndSourceTerm/Python/CMakeLists.txt
+++ b/ProcessLib/BoundaryConditionAndSourceTerm/Python/CMakeLists.txt
@@ -36,21 +36,23 @@ target_compile_definitions(
# TODO there is an ugly cyclic dependency between ProcessLib and the Python BCs
# and STs. We need to include ProcessLib's build dir such that ProcessLib's
# export header, which is autogenerated by cmake in the build dir, can be found.
-target_include_directories(ProcessLibBoundaryConditionAndSourceTermPython
- PRIVATE
- $<TARGET_PROPERTY:ProcessLib,BINARY_DIR>)
+target_include_directories(
+ ProcessLibBoundaryConditionAndSourceTermPython
+ PRIVATE $<TARGET_PROPERTY:ProcessLib,BINARY_DIR>
+)
target_link_libraries(
ProcessLibBoundaryConditionAndSourceTermPython
- PUBLIC BaseLib MathLib MeshLib NumLib
- ${Python3_LIBRARIES}
+ PUBLIC BaseLib MathLib MeshLib NumLib Python::Python
PRIVATE pybind11::pybind11
)
# For the embedded Python module
ogs_add_library(
- ProcessLibBoundaryConditionAndSourceTermPythonModule PythonBoundaryConditionModule.cpp
- PythonBoundaryConditionModule.h BHEInflowPythonBoundaryConditionModule.cpp
+ ProcessLibBoundaryConditionAndSourceTermPythonModule
+ PythonBoundaryConditionModule.cpp
+ PythonBoundaryConditionModule.h
+ BHEInflowPythonBoundaryConditionModule.cpp
BHEInflowPythonBoundaryConditionModule.h
PythonSourceTermModule.cpp
PythonSourceTermModule.h
diff --git a/ProcessLib/HT/Tests.cmake b/ProcessLib/HT/Tests.cmake
index 5b9898e35cfba9b8ef59e26da4574ee00dac4408..7d10f63f62620e571f9f620af064c5affee1eb6f 100644
--- a/ProcessLib/HT/Tests.cmake
+++ b/ProcessLib/HT/Tests.cmake
@@ -352,9 +352,9 @@ AddTest(
VIS ThermalConvection_ts_1_t_0.000000.vtu
)
-if(NOT OGS_USE_MPI AND OGS_BUILD_TESTING AND Python3_FOUND)
+if(NOT OGS_USE_MPI AND OGS_BUILD_TESTING AND Python_FOUND)
add_custom_target(generate_invalid_project_files_ht
- ${Python3_EXECUTABLE}
+ ${Python_EXECUTABLE}
${PROJECT_SOURCE_DIR}/ThirdParty/ogs6py/generateInvalidMediaForHT.py
generateInvalidMediaForHT.py
WORKING_DIRECTORY ${Data_SOURCE_DIR}/Parabolic/HT/InvalidProjectFiles/)
diff --git a/ProcessLib/HeatTransportBHE/Tests.cmake b/ProcessLib/HeatTransportBHE/Tests.cmake
index a06e0d4151a3e41f12efe141f322fb4460741d91..bb90974f91701313c4251673be4ab09bb047bc76 100644
--- a/ProcessLib/HeatTransportBHE/Tests.cmake
+++ b/ProcessLib/HeatTransportBHE/Tests.cmake
@@ -82,7 +82,7 @@ AddTest(
BHE_GW_advection_ts_10_t_500.000000.vtu BHE_GW_advection_ts_10_t_500.000000.vtu temperature_soil temperature_soil 1e-12 1e-13
)
-if("${Python3_VERSION}" VERSION_LESS 3.9)
+if("${Python_VERSION}" VERSION_LESS 3.9)
AddTest(
NAME HeatTransportBHE_3D_3BHEs_array
PATH Parabolic/T/3D_3BHEs_array
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index de6d5f92b5093c121eb22a443139879a24757ad2..c3e66291a6aeef59b267b4df4a7047c3d7d9c25c 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -88,15 +88,8 @@ endif()
if(OGS_USE_PYTHON)
CPMAddPackage(
- NAME pybind11
- GITHUB_REPOSITORY pybind/pybind11
+ NAME pybind11 GITHUB_REPOSITORY pybind/pybind11
GIT_TAG f1abf5d9159b805674197f6bc443592e631c9130
- # pybind11 uses old CMake find functionality, pass variables to use the
- # same Python installation.
- OPTIONS "PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS}"
- "PYTHON_LIBRARIES ${Python3_LIBRARIES}"
- "PYTHON_EXECUTABLE ${Python3_EXECUTABLE}"
- "PYBIND11_PYTHON_VERSION ${Python3_VERSION}"
)
endif()
diff --git a/scripts/cmake/DocumentationSetup.cmake b/scripts/cmake/DocumentationSetup.cmake
index 183a117779fa578817fa9f5e17d59be0afb307c7..4b210bd8457e825d383f6b669d6518647996a8d2 100644
--- a/scripts/cmake/DocumentationSetup.cmake
+++ b/scripts/cmake/DocumentationSetup.cmake
@@ -98,7 +98,7 @@ configure_file(
doxygen_add_docs(doc ${PROJECT_SOURCE_DIR}/ ${PROJECT_BINARY_DIR}/DocAux/dox)
-if(BASH_TOOL_PATH AND Python3_EXECUTABLE)
+if(BASH_TOOL_PATH AND Python_EXECUTABLE)
set(_doc_use_external_tools TRUE)
else()
set(_doc_use_external_tools FALSE)
diff --git a/scripts/cmake/PythonSetup.cmake b/scripts/cmake/PythonSetup.cmake
index ba160e86dc452c7aec31ba7bb5e30f426504067b..8904d2089e47ab6b3f4d46c50d5586ddf7d6a272 100644
--- a/scripts/cmake/PythonSetup.cmake
+++ b/scripts/cmake/PythonSetup.cmake
@@ -1,31 +1,41 @@
# cmake-lint: disable=C0103
-# prefer unix location over frameworks (Apple-only)
-set(Python3_FIND_FRAMEWORK LAST)
+# Prefer unix location over frameworks (Apple-only)
+set(Python_FIND_FRAMEWORK LAST)
+
+# Prefer more recent Python version
+set(Python_FIND_STRATEGY VERSION)
+set(_python_componets Interpreter)
+if(OGS_USE_PYTHON OR OGS_USE_PIP)
+ set(CMAKE_REQUIRE_FIND_PACKAGE_Python TRUE)
+endif()
+if(OGS_USE_PYTHON)
+ list(APPEND _python_componets Development)
+endif()
+find_package(
+ Python ${ogs.minimum_version.python} COMPONENTS ${_python_componets}
+)
+
if(OGS_USE_PIP)
set(OGS_PYTHON_PACKAGES ""
CACHE INTERNAL "List of Python packages to be installed via pip."
)
- set(Python3_FIND_STRATEGY VERSION)
- find_package(
- Python3 ${ogs.minimum_version.python} COMPONENTS Interpreter REQUIRED
- )
if(NOT EXISTS ${PROJECT_BINARY_DIR}/.venv)
execute_process(
- COMMAND ${Python3_EXECUTABLE} -m venv .venv
+ COMMAND ${Python_EXECUTABLE} -m venv .venv
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
unset(_OGS_PYTHON_PACKAGES_SHA1 CACHE)
endif()
- set(Python3_ROOT_DIR ${PROJECT_BINARY_DIR}/.venv)
+ set(Python_ROOT_DIR ${PROJECT_BINARY_DIR}/.venv)
if(MSVC)
- set(Python3_EXECUTABLE ${Python3_ROOT_DIR}/Scripts/python.exe)
+ set(Python_EXECUTABLE ${Python_ROOT_DIR}/Scripts/python.exe)
set(LOCAL_VIRTUALENV_BIN_DIR ${PROJECT_BINARY_DIR}/.venv/Scripts
CACHE INTERNAL ""
)
else()
- set(Python3_EXECUTABLE ${Python3_ROOT_DIR}/bin/python)
+ set(Python_EXECUTABLE ${Python_ROOT_DIR}/bin/python)
set(LOCAL_VIRTUALENV_BIN_DIR ${PROJECT_BINARY_DIR}/.venv/bin
CACHE INTERNAL ""
)
@@ -37,7 +47,7 @@ if(OGS_USE_PIP)
"${ogs.python.notebook_requirements_${var}}"
)
endforeach()
- if("${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" VERSION_EQUAL
+ if("${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}" VERSION_EQUAL
"3.10"
)
# Default python on arch is 3.10; there are no vtk wheels for it
@@ -54,26 +64,3 @@ if(OGS_USE_PIP)
)
endif()
endif()
-
-if(OGS_USE_PYTHON)
- find_package(
- Python3 ${ogs.minimum_version.python} COMPONENTS Interpreter Development
- REQUIRED
- )
-else()
- find_package(Python3 ${ogs.minimum_version.python} COMPONENTS Interpreter)
-endif()
-if(OGS_USE_PIP)
- if(MSVC)
- file(TO_NATIVE_PATH "${Python3_ROOT_DIR}/Lib/site-packages"
- Python3_VIRTUALENV_SITEPACKAGES
- )
- string(REPLACE "\\" "\\\\" Python3_VIRTUALENV_SITEPACKAGES
- ${Python3_VIRTUALENV_SITEPACKAGES}
- )
- else()
- set(Python3_VIRTUALENV_SITEPACKAGES
- ${Python3_ROOT_DIR}/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages
- )
- endif()
-endif()
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index fda2d8368c6a31fa89934415cbcfb20aeb85a1e9..31acf3d180d9499f008b14ac736b4075e884d6e0 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -23,7 +23,7 @@ set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
# Package file name
if(OGS_USE_PYTHON)
- list(APPEND SUFFIX_LIST "python-${Python3_VERSION}")
+ list(APPEND SUFFIX_LIST "python-${Python_VERSION}")
endif()
if(OGS_BUILD_GUI)
list(APPEND SUFFIX_LIST "de")
@@ -69,7 +69,7 @@ endif()
if(OGS_USE_PYTHON)
if(WIN32)
- file(GLOB PYTHON_RUNTIME_LIBS "${Python3_RUNTIME_LIBRARY_DIRS}/*.dll")
+ file(GLOB PYTHON_RUNTIME_LIBS "${Python_RUNTIME_LIBRARY_DIRS}/*.dll")
message(STATUS "Install Python: ${PYTHON_RUNTIME_LIBS}")
install(FILES ${PYTHON_RUNTIME_LIBS} DESTINATION bin)
else()
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index 5cfecf7558831e01c5e6028dafbe3fe63df58bdb..cfffa119d592e7f6730e38f848132ddd0027c660 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -221,7 +221,7 @@ function(AddTest)
if(AddTest_TESTER STREQUAL "xdmfdiff" AND NOT TARGET xdmfdiff)
return()
endif()
- if(AddTest_TESTER STREQUAL "gmldiff" AND NOT ${Python3_Interpreter_FOUND})
+ if(AddTest_TESTER STREQUAL "gmldiff" AND NOT ${Python_Interpreter_FOUND})
return()
endif()
if(AddTest_TESTER STREQUAL "memcheck" AND NOT GREP_TOOL_PATH)
@@ -369,13 +369,13 @@ Use six arguments version of AddTest with absolute and relative tolerances"
get_filename_component(FILE_EXPECTED ${GML_FILE} NAME)
if(WIN32)
- file(TO_NATIVE_PATH "${Python3_EXECUTABLE}" PY_EXE)
+ file(TO_NATIVE_PATH "${Python_EXECUTABLE}" PY_EXE)
# Dirty hack for Windows Python paths with spaces:
string(REPLACE "Program Files" "\"Program Files\"" PY_EXE
${PY_EXE}
)
else()
- set(PY_EXE ${Python3_EXECUTABLE})
+ set(PY_EXE ${Python_EXECUTABLE})
endif()
list(
APPEND
diff --git a/scripts/cmake/test/NotebookTest.cmake b/scripts/cmake/test/NotebookTest.cmake
index 0ea7beddcb76bd4979deab13d75e7f44f8ad3f81..9ae55160083ac1430e40e88bd9dacf57cbbf5a52 100644
--- a/scripts/cmake/test/NotebookTest.cmake
+++ b/scripts/cmake/test/NotebookTest.cmake
@@ -61,7 +61,7 @@ function(NotebookTest)
add_test(
NAME ${TEST_NAME}
COMMAND
- ${CMAKE_COMMAND} -DEXECUTABLE=${Python3_EXECUTABLE}
+ ${CMAKE_COMMAND} -DEXECUTABLE=${Python_EXECUTABLE}
"-DEXECUTABLE_ARGS=${_exe_args}"
-DWORKING_DIRECTORY=${Data_SOURCE_DIR} -DCAT_LOG=TRUE -P
${PROJECT_SOURCE_DIR}/scripts/cmake/test/OgsTestWrapper.cmake
diff --git a/scripts/test/cppcheck.in.sh b/scripts/test/cppcheck.in.sh
index ef88131fcdc2d44c35c033583473da1cdeaaa44e..4e697174904e276660aea1c3cb1784d73f49895b 100644
--- a/scripts/test/cppcheck.in.sh
+++ b/scripts/test/cppcheck.in.sh
@@ -26,6 +26,6 @@ echo "$( \
printf ']\n')" \
> $OUTPUT_FILE
-if [ -f ${Python3_EXECUTABLE} ]; then
- ${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/test/cppcheck_gen_hashes.py $OUTPUT_FILE
+if [ -f ${Python_EXECUTABLE} ]; then
+ ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/test/cppcheck_gen_hashes.py $OUTPUT_FILE
fi