Skip to content

Commit

Permalink
Do not modify LD_LIBRARY_PATH when setting install_path
Browse files Browse the repository at this point in the history
Previously, it was required to add <root>/lib to LD_LIBRARY_PATH because
CADET-Core was not setting the RPATH correctly. This was fixed in CADET
v4.4.0
Since the lib path was simply appended to os.environ['LD_LIBRARY_PATH']
this could lead to inconsistent behaviour when trying to compare
different versions of CADET-Core and other versions were not properly
removed.
  • Loading branch information
schmoelder committed Aug 14, 2024
1 parent ee5b6fd commit 8e231a1
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions cadet/cadet.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import copy
import json
import os
import platform
import pprint
import shutil
Expand Down Expand Up @@ -337,15 +336,6 @@ def install_path(self, install_path):
if dll_path.is_file():
self.cadet_dll_path = dll_path.as_posix()

if platform.system() != 'Windows':
try:
cadet_lib_path = cadet_root / 'lib'
if cadet_lib_path.as_posix() not in os.environ['LD_LIBRARY_PATH']:
os.environ['LD_LIBRARY_PATH'] += \
os.pathsep + cadet_lib_path.as_posix()
except KeyError:
os.environ['LD_LIBRARY_PATH'] = cadet_lib_path.as_posix()

def transform(self, x):
return str.upper(x)

Expand Down

0 comments on commit 8e231a1

Please sign in to comment.