Merge pull request #134 from gaelforget/v0p4p6d

refine system_check, try testing on macos
gaelforget · Sep 16, 2024 · 2bfb96b · 2bfb96b
2 parents 479c247 + 804e70c
commit 2bfb96b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MITgcm"
 uuid = "dce5fa8e-68ce-4431-a242-9469c69627a0"
 authors = ["gaelforget <[email protected]>"]
-version = "0.4.5"
+version = "0.4.6"
 
 [deps]
 ClimateModels = "f6adb021-9183-4f40-84dc-8cea6f651bb0"

diff --git a/src/System.jl b/src/System.jl
@@ -66,7 +66,10 @@ set_environment_variables_to_default()=begin
     ENV_print("DATADEPS_ALWAYS_ACCEPT",true)
     ENV_print("MPI_INC_DIR","/usr/lib/x86_64-linux-gnu/openmpi/include")
     ENV_print("NETCDF_ROOT","/usr")
-  elseif Sys.isapple()
+  elseif Sys.isapple()&&(Sys.ARCH==:x86_64)
+    ENV_print("NETCDF_ROOT","/usr/local")
+    ENV_print("MPI_INC_DIR","/usr/local/include")
+  elseif Sys.isapple() #&&(Sys.ARCH==:AArch64)
     ENV_print("NETCDF_ROOT","/opt/homebrew")
     ENV_print("MPI_INC_DIR","/opt/homebrew/include")
   else