mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-31 17:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

re: NCF-318

Browse Source 
Fixed bug in ncgen. When classic format was in force (k=1 or
k=4), the "long" datatype should be treated as int32. Was
returning an error.
This commit is contained in:
dmh 2014-10-10 15:02:02 -06:00
commit e79befedfe
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -680,11 +680,17 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
ENDIF(NOT MSVC)
# Assert HDF5 version.
SET(HDF5_VERSION_REQUIRED 1.8.8)
execute_process(COMMAND sh -c "h5cc -showconfig | grep -i \"HDF5 version\" | sed 's/^.*[^0-9]\\([0-9]*\\.[0-9]*\\.[0-9]*\\).*$/\\1/'"
OUTPUT_VARIABLE HDF5_VERSION
ERROR_QUIET
)
SET(HDF5_VERSION_REQUIRED 1.8.10)
IF(HDF5_IS_PARALLEL)
SET(HDF5_CC h5pcc)
ELSE()
SET(HDF5_CC h5cc)
ENDIF()
execute_process(COMMAND sh -c "${HDF5_CC} -showconfig | grep -i 'HDF5 version' | cut -d: -f2 | tr -d ' '"
OUTPUT_VARIABLE HDF5_VERSION
ERROR_QUIET)
# It cannot be assumed that libhdf5.settings exists. If it doesn't,
# the call to h5cc will have failed. At this point we will have to
@ -696,6 +702,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
IF(${HDF5_VERSION} VERSION_LESS ${HDF5_VERSION_REQUIRED})
MESSAGE(FATAL_ERROR
"netCDF requires at least HDF5 ${HDF5_VERSION_REQUIRED}. Found ${HDF5_VERSION}.")
ELSE()
MESSAGE(STATUS "Found HDF5 libraries version ${HDF5_VERSION}")
ENDIF()
ENDIF()