From b26239d508274e615d4638d79158343e1e9aac3e Mon Sep 17 00:00:00 2001 From: Edward Hartnett Date: Wed, 19 Aug 2020 06:57:31 -0600 Subject: [PATCH] adding netCDF interation to build summary and pio_meta.h --- CMakeLists.txt | 7 +++++++ configure.ac | 2 ++ libpio.settings.in | 1 + src/clib/pio_meta.h.in | 1 + 4 files changed, 11 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40e915f655e..667e38c544c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -346,6 +346,12 @@ CHECK_C_SOURCE_COMPILES(" #endif int main() {return 0;}" HAVE_DISPATCH2) +if (NETCDF_INTEGRATION) + set(HAVE_NETCDF_INTEGRATION 1) +else () + set(HAVE_NETCDF_INTEGRATION 0) +endif () + ##### # Configure and print the libpio.settings file. ##### @@ -393,6 +399,7 @@ is_enabled(HAVE_H5Z_SZIP HAS_SZLIB) is_enabled(HDF5_HAS_PAR_FILTERS HAS_PAR_FILTERS) is_enabled(HAVE_NETCDF4 HAS_NETCDF4) is_enabled(HAVE_NETCDF_PAR HAS_NETCDF4_PAR) +is_enabled(HAVE_NETCDF_INTEGRATION HAS_NETCDF_INTEGRATION) # Generate file from template. CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libpio.settings.in" diff --git a/configure.ac b/configure.ac index da60e1afe21..9aa23ff0bf5 100644 --- a/configure.ac +++ b/configure.ac @@ -413,6 +413,7 @@ AX_SET_META([PIO_HAS_PNETCDF],[$enable_pnetcdf],[yes]) AX_SET_META([PIO_HAS_PAR_FILTERS], [$have_par_filters],[yes]) AX_SET_META([PIO_HAS_NETCDF4], [$have_netcdf4],[yes]) AX_SET_META([PIO_HAS_NETCDF4_PAR], [$have_netcdf_par],[yes]) +AX_SET_META([PIO_HAS_NETCDF_INTEGRATION], [$enable_netcdf_integration],[yes]) # Create output variables from various shell variables, for use in # generating libpio.settings. @@ -430,6 +431,7 @@ AC_SUBST(HAS_SZIP_WRITE, [$have_szip_write]) AC_SUBST([HAS_PAR_FILTERS], [$have_par_filters]) AC_SUBST([HAS_NETCDF4], [$have_netcdf4]) AC_SUBST([HAS_NETCDF4_PAR], [$have_netcdf_par]) +AC_SUBST([HAS_NETCDF_INTEGRATION], [$enable_netcdf_integration]) # Create the build summary file. AC_CONFIG_FILES([libpio.settings diff --git a/libpio.settings.in b/libpio.settings.in index d6e42ff72cf..7eefe3134fa 100644 --- a/libpio.settings.in +++ b/libpio.settings.in @@ -31,4 +31,5 @@ SZIP Write Support: @HAS_SZIP_WRITE@ Parallel Filters: @HAS_PAR_FILTERS@ NetCDF/HDF5 Support: @HAS_NETCDF4@ NetCDF/HDF5 Par I/O: @HAS_NETCDF4_PAR@ +NetCDF Integration: @HAS_NETCDF_INTEGRATION@ diff --git a/src/clib/pio_meta.h.in b/src/clib/pio_meta.h.in index 0b364df626c..8cbe2019fd7 100644 --- a/src/clib/pio_meta.h.in +++ b/src/clib/pio_meta.h.in @@ -28,5 +28,6 @@ #define PIO_HAS_PAR_FILTERS @PIO_HAS_PAR_FILTERS@ /*!< NetCDF supports parallel I/O with filters. */ #define PIO_HAS_NETCDF4 @PIO_HAS_NETCDF4@ /*!< NetCDF-4 supported. */ #define PIO_HAS_NETCDF4_PAR @PIO_HAS_NETCDF4_PAR@ /*!< NetCDF-4 parallel I/O supported. */ +#define PIO_HAS_NETCDF_INTEGRATION @PIO_HAS_NETCDF_INTEGRATION@ /*!< NetCDF integration supported. */ #endif