Updated CMakeLists to explicitely look for static or shared hdf5 libraries. Required as part of hdf5 1.8.16, and is documented in https://github.com/Unidata/netcdf-c/issues/186

This commit is contained in:
Ward Fisher 2016-01-07 14:11:44 -07:00
parent 3bb57f0a8e
commit 2d25f9b915
3 changed files with 21281 additions and 21276 deletions

View File

@ -482,22 +482,27 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
IF(FIND_SHARED_LIBS)
SET(H5_BUILT_AS_DYNAMIC_LIB ON)
SET(HDF5_USE_STATIC_LIBRARIES OFF)
SET(NC_HDF5_LINK_TYPE "shared")
ELSE()
SET(H5_BUILT_AS_DYNAMIC_LIB OFF)
SET(HDF5_USE_STATIC_LIBRARIES ON)
SET(NC_HDF5_LINK_TYPE "static")
ENDIF()
IF(MSVC)
FIND_PACKAGE(HDF5 COMPONENTS C HL NO_MODULE REQUIRED)
FIND_PACKAGE(HDF5 COMPONENTS C HL NO_MODULE REQUIRED ${NC_HDF5_LINK_TYPE})
ELSE()
FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED ${NC_HDF5_LINK_TYPE})
ENDIF()
ENDIF()
IF(NOT HDF5_FOUND)
MESSAGE(FATAL_ERROR "Unable to locate HDF5. Disable netcdf-4 or install libhdf5 1.8.9 or later.")
ELSE()
MESSAGE(STATUS "HDF5_LIBRARIES: ${HDF5_LIBRARIES}")
MESSAGE(STATUS "HDF_FOUND: ${HDF5_FOUND}")
MESSAGE(STATUS "hdf5: ${hdf5}")
MESSAGE(STATUS "HDF5_hdf5: ${hdf5}")
MESSAGE(STATUS "HDF5_LIBRARIES: ${HDF5_LIBRARIES}")
MESSAGE(STATUS "HDF5_C_LIBRARIES: ${HDF5_C_LIBRARIES}")
MESSAGE(STATUS "HDF5_C_SHARED_LIBRARIES: ${HDF5_C_SHARED_LIBRARIES}")
MESSAGE(STATUS "HDF5_C_LIBRARIES_SHARED: ${HDF5_C_LIBRARIES_SHARED}")

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff