elastix mac update

ChristophKirst · Feb 27, 2019 · 1a0a6ef · 1a0a6ef
1 parent ae57ca9
commit 1a0a6ef
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/ClearMap/Alignment/Elastix.py b/ClearMap/Alignment/Elastix.py
@@ -117,12 +117,22 @@ def setElastixLibraryPath(path = None):
     if path is None:
         path = settings.ElastixPath;
 
-    if os.environ.has_key('LD_LIBRARY_PATH'):
-        lp = os.environ['LD_LIBRARY_PATH'];
+    import platform
+    systemname = platform.system()
+    if systemname == 'Linux':
+        ldpath = 'LD_LIBRARY_PATH';
+    else:
+        ldpath = 'DYLD_LIBRARY_PATH';
+    print(ldpath)
+
+    if os.environ.has_key(ldpath):
+        lp = os.environ[ldpath];
         if not path in lp.split(':'):
-            os.environ['LD_LIBRARY_PATH'] = lp + ':' + path;
+            os.environ[ldpath] = lp + ':' + path;
     else:
-        os.environ['LD_LIBRARY_PATH'] = path
+        os.environ[ldpath] = path
+
+    print(os.environ[ldpath])
 
 
 def initializeElastix(path = None):
@@ -170,6 +180,14 @@ def initializeElastix(path = None):
 
     print "Elastix sucessfully initialized from path: %s" % path;
 
+    import platform
+    systemname = platform.system()
+    if systemname != 'Linux':
+        ElastixBinary = 'DYLD_LIBRARY_PATH='+elastixlib+' '+ElastixBinary
+        TransformixBinary = 'DYLD_LIBRARY_PATH='+elastixlib+' '+TransformixBinary
+
+    printSettings()
+
     return path;