From f71434fa169e42b3629a11d47d5f7bf24627b535 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 24 Jan 2020 16:36:06 -0700 Subject: [PATCH 1/4] Added namespace prefix to netCDF_LIBRARIES in CMake in support of https://github.com/Unidata/netcdf-c/issues/1607 --- netCDFConfig.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in index c89cf3e67..fe76aa256 100644 --- a/netCDFConfig.cmake.in +++ b/netCDFConfig.cmake.in @@ -9,7 +9,7 @@ set_and_check(netCDF_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(netCDF_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") -set(netCDF_LIBRARIES netcdf) +set(netCDF_LIBRARIES netcdf::netcdf) # include target information include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") From e8c2d22ddd066a8a87aa0f275ca14f3fe37eca87 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 24 Jan 2020 16:36:29 -0700 Subject: [PATCH 2/4] Cleaned up szlib status message in libnetcdf.settings. --- CMakeLists.txt | 1 + libnetcdf.settings.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1a0a05d5..084b294aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1960,6 +1960,7 @@ is_enabled(ENABLE_ZERO_LENGTH_COORD_BOUND RELAX_COORD_BOUND) is_enabled(USE_CDF5 HAS_CDF5) is_enabled(ENABLE_ERANGE_FILL HAS_ERANGE_FILL) is_enabled(HDF5_HAS_PAR_FILTERS HAS_PAR_FILTERS) +is_enabled(HAVE_H5Z_SZIP HAS_SZLIB) # Generate file from template. CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in" diff --git a/libnetcdf.settings.in b/libnetcdf.settings.in index 6af76e4c3..71a546935 100644 --- a/libnetcdf.settings.in +++ b/libnetcdf.settings.in @@ -39,7 +39,7 @@ MMap Support: @HAS_MMAP@ JNA Support: @HAS_JNA@ CDF5 Support: @HAS_CDF5@ ERANGE Fill Support: @HAS_ERANGE_FILL@ -Relaxed Boundary Check: yes +Relaxed Boundary Check: @RELAX_COORD_BOUND@ SZIP Support: @HAS_SZLIB@ SZIP Write Support: @HAS_SZLIB@ Parallel Filters: @HAS_PAR_FILTERS@ From ec30c199a187f343645cc67dc751fa2fe0337561 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 24 Jan 2020 16:53:16 -0700 Subject: [PATCH 3/4] Correct typo. --- netCDFConfig.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in index fe76aa256..9d68eec5a 100644 --- a/netCDFConfig.cmake.in +++ b/netCDFConfig.cmake.in @@ -9,7 +9,7 @@ set_and_check(netCDF_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@") set_and_check(netCDF_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") -set(netCDF_LIBRARIES netcdf::netcdf) +set(netCDF_LIBRARIES netCDF::netcdf) # include target information include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") From a0e2a958e470a0d27153c345e7024d4b6fc6a548 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Fri, 24 Jan 2020 17:15:29 -0700 Subject: [PATCH 4/4] Tweaked configure.ac --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 23795b60e..958f2fe4e 100644 --- a/configure.ac +++ b/configure.ac @@ -1297,6 +1297,7 @@ AM_CONDITIONAL(BUILD_DOCS, [test x$enable_doxygen = xyes]) AM_CONDITIONAL(SHOW_DOXYGEN_TAG_LIST, [test x$enable_doxygen_tasks = xyes]) AM_CONDITIONAL(ENABLE_METADATA_PERF, [test x$enable_metadata_perf = xyes]) AM_CONDITIONAL(ENABLE_BYTERANGE, [test "x$enable_byterange" = xyes]) +AM_CONDITIONAL(RELAX_COORD_BOUND, [test "xyes" = xyes]) # If the machine doesn't have a long long, and we want netCDF-4, then # we've got problems! @@ -1427,6 +1428,7 @@ AC_SUBST(HAS_MMAP,[$enable_mmap]) AC_SUBST(HAS_JNA,[$enable_jna]) AC_SUBST(HAS_ERANGE_FILL,[$enable_erange_fill]) AC_SUBST(HAS_BYTERANGE,[$enable_byterange]) +AC_SUBST(RELAX_COORD_BOUND,[yes]) # Include some specifics for netcdf on windows. #AH_VERBATIM([_WIN32_STRICMP],