TPL: Another try at faodwl; use system boost

sandialabs · Aug 10, 2023 · 2bab48c · 2bab48c
1 parent dad919b
commit 2bab48c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml
@@ -28,7 +28,7 @@ jobs:
 
       - name: Install System dependencies
         shell: bash -l {0}
-        run: sudo apt update && sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev openmpi-bin libopenmpi-dev
+        run: sudo apt update && sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev openmpi-bin libopenmpi-dev boost
 
         ###
         # Installing TPL
@@ -292,7 +292,7 @@ jobs:
 
       - name: Install System dependencies
         shell: bash -l {0}
-        run: sudo apt update && sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev openmpi-bin libopenmpi-dev
+        run: sudo apt update && sudo apt install -y libaec-dev zlib1g-dev automake autoconf libcurl4-openssl-dev libjpeg-dev wget curl bzip2 m4 flex bison cmake libzip-dev openmpi-bin libopenmpi-dev boost 
 
       - name: Fetch TPL Cache
         id: cache-TPL

diff --git a/TPL/faodel/runcmake.sh b/TPL/faodel/runcmake.sh
@@ -8,12 +8,9 @@ fi
 INSTALL_PATH=${INSTALL_PATH:-${ACCESS}}
 . ${ACCESS}/TPL/compiler.sh
 
-BOOST_ROOT=${BOOST_ROOT:-${INSTALL_PATH}}
 if [ "X$BOOST_ROOT" == "X" ] ; then
-  BOOST_ROOT=$(cd ../../../..; pwd)
   echo "Faodel requires these Boost packages: atomic log log_setup serialization"
   echo "Please set BOOST_ROOT."
-  exit 0
 fi
 
 rm -f CMakeCache.txt

diff --git a/install-tpl.sh b/install-tpl.sh
@@ -120,7 +120,7 @@ H5VERSION=${H5VERSION:-V114}
 FAODEL=${FAODEL:-NO}
 FAODEL=$(check_valid FAODEL)
 
-BOOST=${BOOST:-${FAODEL}}
+BOOST=${BOOST:-NO}
 BOOST=$(check_valid BOOST)
 
 ADIOS2=${ADIOS2:-NO}