From 312444e3a36a883c6c93a5e86bdd6fac2818486c Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Thu, 22 Aug 2024 19:44:56 +0000 Subject: [PATCH] Per #2948, updating script to work with two versions of ecbuild, eckit, and atlas --- .../scripts/installation/compile_MET_all.sh | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/internal/scripts/installation/compile_MET_all.sh b/internal/scripts/installation/compile_MET_all.sh index 635ba56775..16d0f16938 100755 --- a/internal/scripts/installation/compile_MET_all.sh +++ b/internal/scripts/installation/compile_MET_all.sh @@ -640,7 +640,11 @@ if [ $COMPILE_ECKIT -eq 1 ]; then # Need to obtain ecbuild before installing eckit - vrs="3.7.0" + if [[ ${MET_CXX_STANDARD} -le 14 ]]; then + vrs="3.5.0" + else + vrs="3.7.0" + fi echo echo "Compiling ECBUILD at `date`" @@ -652,9 +656,13 @@ if [ $COMPILE_ECKIT -eq 1 ]; then run_cmd "mkdir build; cd build" 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" - - vrs="1.24.4" + if [[ ${MET_CXX_STANDARD} -le 14 ]]; then + vrs="1.20.2" + else + vrs="1.24.4" + fi + echo echo "Compiling ECKIT at `date`" mkdir -p ${LIB_DIR}/eckit @@ -671,7 +679,11 @@ fi # Compile ATLAS if [ $COMPILE_ATLAS -eq 1 ]; then - vrs="0.35.0" + if [[ ${MET_CXX_STANDARD} -le 14 ]]; then + vrs="0.30.0" + else + vrs="0.35.0" + fi echo echo "Compiling ATLAS at `date`"