Skip to content

Commit

Permalink
Per #2948, updating script to work with two versions of ecbuild, ecki…
Browse files Browse the repository at this point in the history
…t, and atlas
  • Loading branch information
Julie Prestopnik committed Aug 22, 2024
1 parent 3b63adb commit 312444e
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions internal/scripts/installation/compile_MET_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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`"
Expand All @@ -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
Expand All @@ -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`"
Expand Down

0 comments on commit 312444e

Please sign in to comment.