Merge pull request #12 from mantidproject/feature/11085_fix_clang_build

Only set DYLD_LIBRARY_PATH in OS X Mountain Lion and older
mantidproject · Feb 12, 2015 · 082398f · 082398f
2 parents 3019779 + 4fc3452
commit 082398f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/InstallerTesting/mantidinstaller.py b/InstallerTesting/mantidinstaller.py
@@ -225,7 +225,9 @@ class DMGInstaller(MantidInstaller):
     def __init__(self, do_install):
         MantidInstaller.__init__(self, do_install, 'mantid-*.dmg')
         self.mantidPlotPath = '/Applications/MantidPlot.app/Contents/MacOS/MantidPlot'
-        os.environ['DYLD_LIBRARY_PATH'] = '/Applications/MantidPlot.app/Contents/MacOS'
+        # only necessary on 10.8 build
+        if platform.release().split('.')[0] < 13:
+            os.environ['DYLD_LIBRARY_PATH'] = '/Applications/MantidPlot.app/Contents/MacOS'
 
     def do_install(self):
         """Mounts the dmg and copies the application into the right place.

diff --git a/InstallerTesting/runSystemTests.py b/InstallerTesting/runSystemTests.py
@@ -71,7 +71,8 @@
 # not the dynamic library path variable name
 if platform.system() == 'Windows':
   path_var = "PATH"
-elif platform.system() == 'Darwin':
+# only necessary on 10.8 build
+elif platform.system() == 'Darwin' and platform.release().split('.')[0] < 13 :
   path_var = "DYLD_LIBRARY_PATH"
 else:
   path_var = None