BUILD: Enable build/install of hdf5 c++ library [ci skip]

sandialabs · Nov 7, 2023 · 393656a · 393656a
1 parent 3b4dc92
commit 393656a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -77,7 +77,8 @@ manually as detailed in
 | KOKKOS          | YES, NO | NO  | Should Kokkos TPL be built. |
 | GNU_PARALLEL    | YES, NO | YES | Should GNU parallel script be built. |
 | FMT             | YES, NO | YES | Should Lib::FMT TPL be built. |
-| H5VERSION       | V114, V110, V18 | V110 | Use HDF5-1.14.X, HDF5-1.10.X or HDF5-1.8.X |
+| H5VERSION       | V114, V110, V18 | V114 | Use HDF5-1.14.X, HDF5-1.10.X or HDF5-1.8.X |
+| H5CPP           | YES, NO | NO  | Should the HDF5 C++ library be built/installed |
 | BB              | YES, NO | NO  | Enable Burst Buffer support in PnetCDF |
 | JOBS            | {count} |  2   | Number of "jobs" used for simultaneous compiles |
 | SUDO            | "" or sudo | "" | If need to be superuser to install |

diff --git a/TPL/hdf5/runcmake.sh b/TPL/hdf5/runcmake.sh
@@ -7,8 +7,6 @@ if [ "X$ACCESS" == "X" ] ; then
 fi
 INSTALL_PATH=${INSTALL_PATH:-${ACCESS}}
 
-H5VERSION=${H5VERSION:-V110}
-
 DEBUG="${DEBUG:-NO}"
 if [ "$DEBUG" == "YES" ]
 then
@@ -65,7 +63,7 @@ cmake .. -DCMAKE_C_COMPILER:FILEPATH=${CC} \
 	 -DDEFAULT_API_VERSION=V18 \
 	 -DHDF5_ENABLE_PARALLEL:BOOL=${MPI} \
 	 -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON \
-	 -DHDF5_BUILD_CPP_LIB:BOOL=OFF \
+	 -DHDF5_BUILD_CPP_LIB:BOOL=${H5CPP} \
 	 -DHDF5_BUILD_FORTRAN:BOOL=OFF \
 	 -DHDF5_BUILD_HL_LIB:BOOL=ON \
 	 -DHDF5_DISABLE_COMPILER_WARNINGS:BOOL=ON \

diff --git a/install-tpl.sh b/install-tpl.sh
@@ -123,6 +123,9 @@ KOKKOS=${KOKKOS:-NO}
 KOKKOS=$(check_valid KOKKOS)
 
 H5VERSION=${H5VERSION:-V114}
+# Build/Install the HDF5 C++ library?
+H5CPP=${H5CPP:-NO}
+H5CPP=$(check_valid H5CPP)
 
 FAODEL=${FAODEL:-NO}
 FAODEL=$(check_valid FAODEL)
@@ -200,6 +203,7 @@ if [ $# -gt 0 ]; then
         echo "   PNETCDF      = ${PNETCDF}"
         echo "   HDF5         = ${HDF5}"
         echo "   H5VERSION    = ${H5VERSION}"
+        echo "   H5CPP        = ${H5CPP}"
         echo "   CGNS         = ${CGNS}"
         echo "   MATIO        = ${MATIO}"
         echo "   METIS        = ${METIS}"
@@ -459,7 +463,7 @@ then
             rm -rf build
             mkdir build
             cd build || exit
-            CRAY=${CRAY} H5VERSION=${H5VERSION} DEBUG=${DEBUG} SHARED=${SHARED} NEEDS_ZLIB=${NEEDS_ZLIB} NEEDS_SZIP=${NEEDS_SZIP} MPI=${MPI} bash -x ../../runcmake.sh
+            CRAY=${CRAY} H5CPP=${H5CPP} H5VERSION=${H5VERSION} DEBUG=${DEBUG} SHARED=${SHARED} NEEDS_ZLIB=${NEEDS_ZLIB} NEEDS_SZIP=${NEEDS_SZIP} MPI=${MPI} bash -x ../../runcmake.sh
             #CRAY=${CRAY} H5VERSION=${H5VERSION} DEBUG=${DEBUG} SHARED=${SHARED} NEEDS_ZLIB=${NEEDS_ZLIB} NEEDS_SZIP=${NEEDS_SZIP} MPI=${MPI} bash ../runconfigure.sh
             if [[ $? != 0 ]]
             then
@@ -779,7 +783,7 @@ then
         then
             echo "${txtgrn}+++ Configuring, Building, and Installing...${txtrst}"
             cd fmt || exit
-            git checkout ${fmt_version}
+#            git checkout ${fmt_version}
             rm -rf build
             mkdir build
             cd build || exit