From 01a0909105dfc6700e4c64b40b809b345623654c Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 31 Jul 2024 12:35:34 +0200
Subject: [PATCH] [py] Install python modules into spec. dir. in the build
folder.
Allows co-existance with ogstools python package in build dir virtual environment.
Requires to uninstall ogs wheel in venv and to set the PYTHONPATH (both handled by CMake and .envrc-file used by the direnv-tool).
---
Applications/Python/CMakeLists.txt | 20 ++++++++------------
CMakeLists.txt | 1 +
scripts/cmake/PythonSetup.cmake | 5 +++++
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Applications/Python/CMakeLists.txt b/Applications/Python/CMakeLists.txt
index eedad10786d..2a34dbda0f2 100644
--- a/Applications/Python/CMakeLists.txt
+++ b/Applications/Python/CMakeLists.txt
@@ -1,14 +1,11 @@
-set(_py_site_packages_dir
- "lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages"
-)
-if(WIN32)
- set(_py_site_packages_dir "Lib/site-packages")
-endif()
-
# wheel: Install into Python module root dir (enables 'import ogs.simulator')
set(_py_install_location ogs)
+set(_py_build_location ogs)
if(NOT OGS_BUILD_WHEEL)
- set(_py_install_location "${_py_site_packages_dir}/ogs")
+ set(_py_install_location
+ "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/ogs"
+ )
+ set(_py_build_location "${PROJECT_BINARY_DIR}/site-packages/ogs")
endif()
add_subdirectory(ogs)
@@ -18,13 +15,12 @@ add_subdirectory(ogs.callbacks)
if(OGS_USE_PIP)
set_target_properties(
- simulator mesh callbacks
- PROPERTIES LIBRARY_OUTPUT_DIRECTORY
- ${LOCAL_VIRTUALENV_DIR}/${_py_site_packages_dir}/ogs
+ simulator mesh callbacks PROPERTIES LIBRARY_OUTPUT_DIRECTORY
+ ${_py_build_location}
)
file(
COPY ogs/.
- DESTINATION ${LOCAL_VIRTUALENV_DIR}/${_py_site_packages_dir}/ogs
+ DESTINATION ${_py_build_location}
PATTERN "__pycache__" EXCLUDE
PATTERN "CMakeLists.txt" EXCLUDE
)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebebc5510b5..70024bb52b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,6 +238,7 @@ set(_envrc_content
"[ -d \"${PROJECT_BINARY_DIR}/.venv\" ] && source ${PROJECT_BINARY_DIR}/.venv/bin/activate"
"export PATH=$PATH:${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}"
"export OGS_USE_PATH=1"
+ "export PYTHONPATH=${PROJECT_BINARY_DIR}/site-packages:$PYTHONPATH"
)
if(TFEL_WITH_PYTHON)
set(_envrc_content "${_envrc_content}"
diff --git a/scripts/cmake/PythonSetup.cmake b/scripts/cmake/PythonSetup.cmake
index fb22b42ee2e..96545ddbd91 100644
--- a/scripts/cmake/PythonSetup.cmake
+++ b/scripts/cmake/PythonSetup.cmake
@@ -175,6 +175,11 @@ function(setup_venv)
"To disable pip set OGS_USE_PIP=OFF.\n\n${_out}\n${_err}"
)
endif()
+ # Uninstall ogs wheel
+ execute_process(
+ COMMAND ${_apple_env} ${LOCAL_VIRTUALENV_BIN_DIR}/pip uninstall
+ --yes ogs WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ )
endif()
endfunction()
--
GitLab