Refs #4204. Be slighlty more picky about which file is chosen

mantidproject · Dec 6, 2011 · b8b6005 · b8b6005
1 parent cf65373
commit b8b6005
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/MantidFramework.py b/Code/Mantid/Framework/PythonAPI/MantidFramework.py
@@ -55,7 +55,15 @@
     dlloader = libdlopen.loadlibrary
     import subprocess
 
-    _bin = os.environ['MANTIDPATH']
+    _bin = os.path.abspath(os.path.dirname(__file__))
+    pythonlib = os.path.join(_bin,'libMantidPythonAPI.so')
+    if not os.path.exists(pythonlib):
+        _bin = os.environ['MANTIDPATH']
+        pythonlib = os.path.join(_bin,'libMantidPythonAPI.so')
+        if not os.path.exists(pythonlib):
+            raise RuntimeError('Unable to find libMantidPythonAPI, cannot continue')
+
+    os.environ['MANTIDPATH']
     def get_libpath(mainlib, dependency):
         if platform.system() == 'Linux':
             cmd = 'ldd %s | grep %s' % (mainlib, dependency)
@@ -80,7 +88,6 @@ def get_libpath(mainlib, dependency):
     ldpath = os.environ.get(library_var, "")
     ldpath += ":" + _bin
     os.environ[library_var] = ldpath
-    pythonlib = os.path.join(_bin,'libMantidPythonAPI.so')
     dlloader(get_libpath(pythonlib, 'stdc++'))
     dlloader(get_libpath(pythonlib, 'libNeXus'))
     dlloader(get_libpath(pythonlib, 'libMantidKernel'))