OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2978 from blattms/debian-use-dist-packages-only-for-usr-prefix

Browse Source 
[python] Use dist-packages if it is used for Python's sitepackages
This commit is contained in:
Markus Blatt 2022-03-22 16:42:17 +01:00 committed by GitHub
commit dff978d0eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -334,9 +334,18 @@ install(FILES cmake/OPM-CMake.md
install(FILES etc/opm_bash_completion.sh.in DESTINATION share/opm/etc) install(FILES etc/opm_bash_completion.sh.in DESTINATION share/opm/etc)
if (OPM_ENABLE_PYTHON) if (OPM_ENABLE_PYTHON)
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
import site, sys
try:
sys.stdout.write(site.getsitepackages()[-1])
except e:
sys.stdout.write('')" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES_PATH)
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# 1: Wrap C++ functionality in Python # 1: Wrap C++ functionality in Python
if (EXISTS "/etc/debian_version") if (PYTHON_SITE_PACKAGES_PATH MATCHES ".*/dist-packages/?" AND
CMAKE_INSTALL_PREFIX MATCHES "^/usr.*")
# dist-packages is only used if we install below /usr and python's site packages
# path matches dist-packages
set(PYTHON_PACKAGE_PATH "dist-packages") set(PYTHON_PACKAGE_PATH "dist-packages")
else() else()
set(PYTHON_PACKAGE_PATH "site-packages") set(PYTHON_PACKAGE_PATH "site-packages")

2
jenkins/build-opm-module.sh
View File

@ -226,7 +226,7 @@ function build_module_full {
PY_MINOR=`python3 --version | awk -F ' ' '{print $2}' | awk -F '.' '{print $2}'` PY_MINOR=`python3 --version | awk -F ' ' '{print $2}' | awk -F '.' '{print $2}'`
for configuration in ${!configurations[@]} for configuration in ${!configurations[@]}
do do
export PYTHONPATH="$WORKSPACE/$configuration/install/lib/python$PY_MAJOR.$PY_MINOR/dist-packages" export PYTHONPATH="$WORKSPACE/$configuration/install/lib/python$PY_MAJOR.$PY_MINOR/site-packages"
# Build upstream modules # Build upstream modules
build_upstreams build_upstreams