Skip to content

Commit

Permalink
Refs #4204. Change library lookup to one that is always in bin.
Browse files Browse the repository at this point in the history
The old Python framewoek was looking at the depenencies on Kernel but
this is not always next to the MantidFramework file. Move to check against
libMantidPythonAPI that will always be next to the file.
  • Loading branch information
martyngigg committed Nov 29, 2011
1 parent 06ba24e commit 5d006b7
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions Code/Mantid/Framework/PythonAPI/MantidFramework.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,12 @@ def get_libpath(mainlib, dependency):
ldpath = os.environ.get("LD_LIBRARY_PATH", "")
ldpath += ":" + _bin
os.environ["LD_LIBRARY_PATH"] = ldpath
dlloader(get_libpath(os.path.join(_bin,'libMantidKernel.so'), 'stdc++'))
dlloader(get_libpath(os.path.join(_bin,'libMantidKernel.so'), 'libNeXus'))
dlloader(os.path.join(_bin, 'libMantidKernel.so'))
dlloader(os.path.join(_bin, 'libMantidGeometry.so'))
dlloader(os.path.join(_bin, 'libMantidAPI.so'))
pythonlib = os.path.join(_bin,'libMantidPythonAPI.so')
dlloader(get_libpath(pythonlib, 'stdc++'))
dlloader(get_libpath(pythonlib, 'libNeXus'))
dlloader(get_libpath(pythonlib, 'libMantidKernel'))
dlloader(get_libpath(pythonlib, 'libMantidGeometry'))
dlloader(get_libpath(pythonlib, 'libMantidAPI'))

from libMantidPythonAPI import *
from libMantidPythonAPI import _binary_op, _equals_op
Expand Down

0 comments on commit 5d006b7

Please sign in to comment.