mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-30 16:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1686 from Unidata/mpich32_failure.wif

Browse Source 
Fix CMake logic for Testing MPI-based builds
This commit is contained in:
Ward Fisher 2020-04-02 16:03:16 -06:00 committed by GitHub
commit 03b3b89097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -650,9 +650,11 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
# Determine whether parallel filter operation is supported.
IF(${HDF5_VERSION} VERSION_LESS ${HDF5_PAR_FILTER_VERSION})
SET(HDF5_HAS_PAR_FILTERS, "no")
SET(HDF5_HAS_PAR_FILTERS FALSE CACHE BOOL "")
SET(HAS_PAR_FILTERS no CACHE STRING "")
ELSE()
SET(HDF5_HAS_PAR_FILTERS, "yes")
SET(HDF5_HAS_PAR_FILTERS TRUE CACHE BOOL "")
SET(HAS_PAR_FILTERS yes CACHE STRING "")
ENDIF()
##
@ -1151,7 +1153,7 @@ IF(ENABLE_ZERO_LENGTH_COORD_BOUND)
ENDIF()
# Enable Parallel Tests.
OPTION(ENABLE_PARALLEL_TESTS "Enable Parallel IO Tests. Requires HDF5/NetCDF4 with parallel I/O Support." ${USE_PARALLEL})
OPTION(ENABLE_PARALLEL_TESTS "Enable Parallel IO Tests. Requires HDF5/NetCDF4 with parallel I/O Support." "${HDF5_PARALLEL}")
IF(ENABLE_PARALLEL_TESTS AND USE_PARALLEL)
SET(TEST_PARALLEL ON CACHE BOOL "")
IF(USE_NETCDF4)
@ -1978,8 +1980,8 @@ is_enabled(JNA HAS_JNA)
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)
is_enabled(HDF5_HAS_PAR_FILTERS HAS_PAR_FILTERS)
# Generate file from template.
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in"

2
RELEASE_NOTES.md
View File

@ -7,6 +7,8 @@ This file contains a high-level description of this package's evolution. Release
## 4.8.0 - TBD
* [Bug Fix][cmake] Correct an issue with parallel filter test logic in CMake-based builds.
## 4.7.4 - March 27, 2020
* [Windows] Bumped packaged HDF5 to 1.10.6, HDF4 to 4.2.14, and libcurl to 7.60.0.

4
config.h.cmake.in
View File

@ -381,6 +381,10 @@ are set when opening a binary file on Windows. */
/* if true, hdf5 has parallelism enabled */
#cmakedefine HDF5_PARALLEL 1
/* if true, HDF5 is at least version 1.10. 3 and allows parallel I/O
with zip */
#cmakedefine HDF5_SUPPORTS_PAR_FILTERS 1
/* if true, include JNA bug fix */
#cmakedefine JNA 1

2
nc_test4/run_par_test.sh.in
View File

@ -5,6 +5,8 @@
# Ed Hartnett, Dennis Heimbigner, Ward Fisher
set -e
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
. ../test_common.sh