From 6af9ca58105451e41f6027e28556de2617d7dd4a Mon Sep 17 00:00:00 2001
From: "andreas.lagg" <lagg@mps.mpg.de>
Date: Sat, 12 Aug 2023 11:07:24 +0300
Subject: [PATCH] some mac compilation issues
---
idlpro/call_cp.pro | 1 -
idlpro/helix.pro | 3 +--
scripts/compile_mac | 17 ++++++++++++-----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/idlpro/call_cp.pro b/idlpro/call_cp.pro
index 753e317..3438ebb 100644
--- a/idlpro/call_cp.pro
+++ b/idlpro/call_cp.pro
@@ -11,7 +11,6 @@ function call_cp,ipt=ipt,line=line,atm=atm,obs_par=obs_par, $
@common_maxpar
if n_elements(idlso_dir) eq 0 then idlso_dir='./idl.so/'
-
if n_elements(comp) eq 0 then comp=-1
diff --git a/idlpro/helix.pro b/idlpro/helix.pro
index a54eeee..60d42d5 100644
--- a/idlpro/helix.pro
+++ b/idlpro/helix.pro
@@ -118,7 +118,7 @@ pro helix,ifile,ipt=input_file,list=plist,savall=savall, $
ipt=read_ipt(struct=struct_ipt,parin=parin)
struct_mode=1
endelse
-
+
;reading input atmosphere (ATM_INPUT keyword)
read_atminput
@@ -925,7 +925,6 @@ pro helix,ifile,ipt=input_file,list=plist,savall=savall, $
endif
endif
endfor
-
;initialize call to compute_profile
if ipt.code eq 'IDL' then begin
fill_localstray,lsi,lsq,lsu,lsv,dols, $
diff --git a/scripts/compile_mac b/scripts/compile_mac
index adc5da2..95b0388 100755
--- a/scripts/compile_mac
+++ b/scripts/compile_mac
@@ -1,22 +1,29 @@
#!/bin/bash
#compile on ubuntu linux machines
+echo "There is currently no support for Apple Silicon. Solution: Compile it on an intel mac, the binaries can be used also on a Silicon Mac."
+
git pull
autoconf
-#FC=gfortran
-FC=ifort
+FC=gfortran
+#FC=ifort
+
+#cfitsio=./cfitsio
+cfitsio=/opt/homebrew/
+cfitsio=/opt/homebrew/
-cfitsio=./cfitsio
+dislin=/usr/local/dislin
+#dislin=
#create ifort version with X11
-./configure FC=gfortran --with-dislin=/usr/local/dislin --with-cfitsio=$cfitsio
+./configure FC=gfortran --with-dislin=$dislin --with-cfitsio=$cfitsio
make clean all install
[ $? != 0 ] && { echo "Compilation failed. Exit." ; exit ;}
#create gfortran version with X11
-./configure FC=gfortran --with-dislin=/usr/local/dislin --with-cfitsio=$cfitsio
+./configure FC=gfortran --with-dislin=$dislin --with-cfitsio=$cfitsio
make clean all install
[ $? != 0 ] && { echo "Compilation failed. Exit." ; exit ;}
--
GitLab