Per #2948, fixed the logic for compiling versions of ecbuild, eckit, …

…and atlas
dtcenter · Aug 22, 2024 · f95553f · f95553f
1 parent 3b1d5c7
commit f95553f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/internal/scripts/installation/compile_MET_all.sh b/internal/scripts/installation/compile_MET_all.sh
@@ -640,9 +640,9 @@ if  [ $COMPILE_ECKIT -eq 1 ]; then
 
   # Need to obtain ecbuild before installing eckit
 
-  if [[ ${MET_CXX_STANDARD} -le 14 ]]; then
+  if [[ ! -z ${MET_CXX_STANDARD} && ${MET_CXX_STANDARD} -le 14 ]]; then
       vrs="3.5.0"
-  else
+  elif [[ -z ${MET_CXX_STANDARD} ]]; then
       vrs="3.7.0"
   fi
 
@@ -657,9 +657,9 @@ if  [ $COMPILE_ECKIT -eq 1 ]; then
   run_cmd "cmake ../ -DCMAKE_INSTALL_PREFIX=${LIB_DIR} > $(pwd)/ecbuild.cmake.log 2>&1"
   run_cmd "make ${MAKE_ARGS} install > $(pwd)/ecbuild.make_install.log 2>&1"
 
-  if [[ ${MET_CXX_STANDARD} -le 14 ]]; then
+  if [[ ! -z ${MET_CXX_STANDARD} && ${MET_CXX_STANDARD} -le 14 ]]; then
       vrs="1.20.2"
-  else
+  elif [[ -z ${MET_CXX_STANDARD} ]]; then
       vrs="1.24.4"
   fi
 
@@ -679,9 +679,9 @@ fi
 # Compile ATLAS
 if [ $COMPILE_ATLAS -eq 1 ]; then
 
-  if [[ ${MET_CXX_STANDARD} -le 14 ]]; then  
+  if [[ ! -z ${MET_CXX_STANDARD} && ${MET_CXX_STANDARD} -le 14 ]]; then  
       vrs="0.30.0"
-  else
+  elif [[ -z ${MET_CXX_STANDARD} ]]; then
       vrs="0.35.0"
   fi