Supporting v33 solver binaries, fix Mac HDF5 local run fail

frm · frm · commit 62205ed99a91 · 2021-04-08T19:13:59.000-04:00
diff --git a/vcell-core/src/main/java/cbit/vcell/solvers/AbstractCompiledSolver.java b/vcell-core/src/main/java/cbit/vcell/solvers/AbstractCompiledSolver.java
@@ -283,7 +283,9 @@ private void checkLinuxSharedLibs() throws IOException, InterruptedException {
 
 //		System.out.println("-----Setting executable "+LD_LIB_PATH+" to "+newLD_LIB_PATH);
             getMathExecutable().addEnvironmentVariable(LD_LIB_PATH, newLD_LIB_PATH);
-        }
+        }else if (OperatingSystemInfo.getInstance().isMac()) {
+    		getMathExecutable().addEnvironmentVariable("HDF5_DISABLE_VERSION_CHECK", "1");
+    	}
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,9 @@ private void checkLinuxSharedLibs() throws IOException, InterruptedException {`
`283`	`283`
`284`	`284`	`// System.out.println("-----Setting executable "+LD_LIB_PATH+" to "+newLD_LIB_PATH);`
`285`	`285`	`getMathExecutable().addEnvironmentVariable(LD_LIB_PATH, newLD_LIB_PATH);`
`286`		`- }`
	`286`	`+ }else if (OperatingSystemInfo.getInstance().isMac()) {`
	`287`	`+ getMathExecutable().addEnvironmentVariable("HDF5_DISABLE_VERSION_CHECK", "1");`
	`288`	`+ }`
`287`	`289`	`}`
`288`	`290`
`289`	`291`	`/**`