From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Sat, 26 Oct 2024 11:08:49 +0000 (+0200)
Subject: Prise en compte de l'option RELOCATABLE pour la packaging pypi
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a318044c64888a3206dfce607b3ec8260d48f26f;p=modules%2Fkernel.git

Prise en compte de l'option RELOCATABLE pour la packaging pypi
---

diff --git a/activate b/activate
index dfe3df41c..fe76f9fcd 100644
--- a/activate
+++ b/activate
@@ -13,11 +13,6 @@ deactivate () {
         export PYTHONHOME
         unset _OLD_VIRTUAL_PYTHONHOME
     fi
-    if [ -n "${_OLD_VIRTUAL_LD_LIBRARY_PATH:-}" ] ; then
-        LD_LIBRARY_PATH="${_OLD_VIRTUAL_LD_LIBRARY_PATH:-}"
-        export LD_LIBRARY_PATH
-        unset _OLD_VIRTUAL_LD_LIBRARY_PATH
-    fi
 
     # This should detect bash and zsh, which have a hash command that must
     # be called to get it to forget past commands.  Without forgetting
@@ -47,6 +42,7 @@ export VIRTUAL_ENV
 
 _OLD_VIRTUAL_PATH="$PATH"
 PATH="$VIRTUAL_ENV/bin:$PATH"
+PATH="$VIRTUAL_ENV/bin/salome:$PATH"
 export PATH
 
 # unset PYTHONHOME if set
@@ -63,12 +59,6 @@ if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then
     export PS1
 fi
 
-PATH="$VIRTUAL_ENV/bin/salome:$PATH"
-
-_OLD_VIRTUAL_LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}"
-LD_LIBRARY_PATH="$VIRTUAL_ENV/lib/salome:$LD_LIBRARY_PATH"
-export LD_LIBRARY_PATH
-
 # This should detect bash and zsh, which have a hash command that must
 # be called to get it to forget past commands.  Without forgetting
 # past commands the $PATH changes we made may not be respected
diff --git a/pyproject.toml b/pyproject.toml
index ef8b16cef..ed8863424 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,6 +20,7 @@ dynamic = ["version"]
 scipy = ["scipy"]
 
 [tool.scikit-build.cmake.define]
+RELOCATABLE = "ON"
 SALOME_BUILD_TESTS = "ON"
 SALOME_USE_LIBBATCH = "ON"
 SALOME_USE_64BIT_IDS = "ON"