From f52143b250f7c3aeabef0d17f06106ef8f0e3795 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 9 Nov 2022 11:36:33 -0700 Subject: [PATCH] CI: clean up to see if works.. [ci skip] --- .github/workflows/build_external_lib.yml | 2 +- cmake-config | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_external_lib.yml b/.github/workflows/build_external_lib.yml index 40fb3fd595..0437fc5f50 100644 --- a/.github/workflows/build_external_lib.yml +++ b/.github/workflows/build_external_lib.yml @@ -33,7 +33,7 @@ jobs: find /usr/include -name cgnslib.h mkdir build cd build - NETCDF_PATH=/usr CGNS_PATH=/usr HDF5_DIR=/usr MODERN=YES NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME} bash -xv ../cmake-config + NETCDF_PATH=/usr CGNS_PATH=/usr MODERN=YES NUMPROCS=2 COMPILER=${{ matrix.compiler }} INSTALL_PATH=${HOME} bash -xv ../cmake-config - name: Build shell: bash -l {0} diff --git a/cmake-config b/cmake-config index dab3de1933..927b00f63e 100755 --- a/cmake-config +++ b/cmake-config @@ -528,7 +528,9 @@ ${FAODEL_SYMBOLS} \ -D MPI_BIN_DIR:PATH=${MPI_BIN} \ -D NetCDF_ROOT:PATH=${NETCDF_PATH} \ -D HDF5_ROOT:PATH=${HDF5_PATH} \ +-D HDF5_DIR:PATH=${HDF5_PATH} \ -D CGNS_ROOT:PATH=${CGNS_PATH} \ +-D CGNS_DIR:PATH=${CGNS_PATH} \ -D Matio_ROOT:PATH=${MATIO_PATH} \ -D Metis_ROOT:PATH=${METIS_PATH} \ -D ParMETIS_ROOT:PATH=${PARMETIS_PATH} \