mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-01-30 16:10:44 +08:00
Merge branch 'master' into gh276
This commit is contained in:
commit
98f5de4bf7
@ -537,6 +537,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
|
||||
IF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR)
|
||||
SET(HDF5_LIBRARIES ${HDF5_C_LIBRARY} ${HDF5_HL_LIBRARY})
|
||||
SET(HDF5_C_LIBRARIES ${HDF5_C_LIBRARY})
|
||||
SET(HDF5_C_LIBRARY_hdf5 ${HDF5_C_LIBRARY})
|
||||
SET(HDF5_HL_LIBRARIES ${HDF5_HL_LIBRARY})
|
||||
INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
|
||||
MESSAGE(STATUS "Using HDF5 C Library: ${HDF5_C_LIBRARY}")
|
||||
@ -618,6 +619,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
|
||||
##
|
||||
IF(${HDF5_VERSION} VERSION_LESS "1.8.16")
|
||||
SET(HDF5_C_LIBRARY hdf5)
|
||||
SET(HDF5_C_LIBRARY_hdf5 hdf5)
|
||||
ENDIF(${HDF5_VERSION} VERSION_LESS "1.8.16")
|
||||
|
||||
IF(${HDF5_VERSION} VERSION_GREATER "1.8.15")
|
||||
@ -650,8 +652,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
|
||||
# Find out if HDF5 was built with parallel support.
|
||||
# Do that by checking for the targets H5Pget_fapl_mpiposx and
|
||||
# H5Pget_fapl_mpio in ${HDF5_LIB}.
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO)
|
||||
IF(HDF5_IS_PARALLEL_MPIPOSIX OR HDF5_IS_PARALLEL_MPIO)
|
||||
SET(HDF5_PARALLEL ON)
|
||||
ELSE()
|
||||
@ -668,7 +670,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
|
||||
ENDIF()
|
||||
|
||||
#Check to see if HDF5 library has collective metadata APIs, (HDF5 >= 1.10.0)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS)
|
||||
|
||||
OPTION(ENABLE_DYNAMIC_LOADING "Enable Dynamic Loading" ON)
|
||||
IF(ENABLE_DYNAMIC_LOADING)
|
||||
@ -677,10 +679,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
|
||||
ENDIF(NOT MSVC)
|
||||
|
||||
# Make sure the user has built the library with zlib support.
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5Pset_deflate "" HAVE_H5PSET_DEFLATE)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_deflate "" HAVE_H5PSET_DEFLATE)
|
||||
|
||||
#Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip.
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5P_SZIP "" USE_SZIP)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5P_SZIP "" USE_SZIP)
|
||||
IF(USE_SZIP)
|
||||
FIND_LIBRARY(SZIP NAMES szip sz)
|
||||
IF(SZIP)
|
||||
@ -691,11 +693,11 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5free_memory "" HDF5_HAS_H5FREE)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HDF5_HAS_H5FREE)
|
||||
IF(HDF5_HAS_H5FREE)
|
||||
SET(HAVE_H5FREE_MEMORY TRUE)
|
||||
ENDIF(HDF5_HAS_H5FREE)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY} H5Pset_libver_bounds "" HDF5_HAS_LIBVER_BOUNDS)
|
||||
CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HDF5_HAS_LIBVER_BOUNDS)
|
||||
|
||||
IF(HDF5_HAS_LIBVER_BOUNDS)
|
||||
SET(HAVE_H5PSET_LIBVER_BOUNDS TRUE)
|
||||
|
Loading…
Reference in New Issue
Block a user