From e10471ab6ce4b972e63d43405f7415c558c25aec Mon Sep 17 00:00:00 2001 From: Matthew Larson Date: Mon, 17 Jul 2023 09:54:02 -0500 Subject: [PATCH] WIP:fix vol-tests build --- build_vol_cmake.sh | 9 ++++++++- test/CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build_vol_cmake.sh b/build_vol_cmake.sh index a2f05d6c..7b424bb5 100755 --- a/build_vol_cmake.sh +++ b/build_vol_cmake.sh @@ -197,12 +197,19 @@ CFLAGS="-D_POSIX_C_SOURCE=200809L" cmake -G "${CMAKE_GENERATOR}" -DCMAKE_INSTALL echo "Build files have been generated for CMake generator '${CMAKE_GENERATOR}'" +mkdir -p "${BUILD_DIR}/tests/vol-tests" cd "${BUILD_DIR}/tests/vol-tests" -CFLAGS="-D_POSIX_C_SOURCE=200809L" cmake -G "${CMAKE_GENERATOR}" -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" "${PREBUILT_HDF5_OPT}" "${CONNECTOR_DEBUG_OPT}" "${CURL_DEBUG_OPT}" "${MEM_TRACK_OPT}" "${THREAD_SAFE_OPT}" "${SCRIPT_DIR}/test/vol-tests" +sudo CFLAGS="-D_POSIX_C_SOURCE=200809L" cmake -G "${CMAKE_GENERATOR}" -DHDF5_VOL_TEST_SERVER=XXXXXXXXXXX -DHDF5_DIR=${INSTALL_DIR} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" "${PREBUILT_HDF5_OPT}" "${CONNECTOR_DEBUG_OPT}" "${CURL_DEBUG_OPT}" "${MEM_TRACK_OPT}" "${THREAD_SAFE_OPT}" "${SCRIPT_DIR}/test/vol-tests" echo "VOL tests built" +cd "${BUILD_DIR}" + +# Build HDF5 first if not prebuilt +cd "${BUILD_DIR}/hdf5" +make -j${NPROCS} && make install || exit 1 + # Build with autotools make by default if [ "${CMAKE_GENERATOR}" = "Unix Makefiles" ]; then make -j${NPROCS} && make install || exit 1 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 38d6141d..1e1384e9 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -27,7 +27,7 @@ if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/vol-tests/CMakeLists.txt) ) message(STATUS ${GIT_SUBMODULE_UPDATE_OUTPUT}) endif() -add_subdirectory(vol-tests) +#add_subdirectory(vol-tests) #----------------------------------------------------------------------------- # REST VOL specific tests