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

Updating how Windows tracks HDF5 libraries to link against.

Browse Source
This commit is contained in:
Ward Fisher 2013-10-07 11:14:24 -06:00
parent 09d4854165
commit c8baf5c0e3
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -515,6 +515,7 @@ IF (USE_HDF5 OR ENABLE_NETCDF_4)
ELSE()
IF(MSVC)
FIND_PACKAGE(HDF5 COMPONENTS C HL NO_MODULE REQUIRED)
MESSAGE(STATUS "Found HDF5: ${HDF5_LIBRARIES}")
ELSE()
FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
ENDIF()
@ -661,7 +662,6 @@ ENDIF()
SET(STATUS_PARALLEL "OFF")
OPTION(ENABLE_PARALLEL "Build netCDF-4 with parallel IO" OFF)
IF(ENABLE_PARALLEL AND ENABLE_NETCDF_4)
MESSAGE(STATUS "Debug: ${HDF5_LIB}")
SET(USE_PARALLEL ON CACHE BOOL "")
# Check for H5Pget_fapl_mpiposx, define USE_PARALLEL_POSIX
CHECK_LIBRARY_EXISTS(${HDF5_LIB} H5Pget_fapl_mpioposix "" USE_PARALLEL_POSIX)

11
liblib/CMakeLists.txt
View File

@ -52,13 +52,16 @@ IF(USE_HDF5 OR USE_NETCDF4)
# Some version of cmake define HDF5_hdf5_LIBRARY instead of
# HDF5_LIBRARY. Same with HDF5_HL_LIBRARY
IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARY)
SET(HDF5_C_LIBRARY ${HDF5_hdf5_LIBRARY})
SET(HDF5_C_LIBRARY ${HDF5_hdf5_LIBRARY} CACHE STRING "Target HDF5_C Library.")
ENDIF()
IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARY)
SET(HDF5_HL_LIBRARY ${HDF5_hdf5_hl_LIBRARY})
SET(HDF5_HL_LIBRARY ${HDF5_hdf5_hl_LIBRARY} CACHE STRING "Target HDF5_HL Library.")
ENDIF()
IF(NOT MSVC)
SET(TLL_LIBS ${HDF5_C_LIBRARY} ${HDF5_HL_LIBRARY} ${TLL_LIBS} ${SZIP_LIBRARY} CACHE STRING "Target link libraries")
ELSE() # Windows CMake defines HDF5_LIBRARIES.
SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY} CACHE STRING "Target link libraries")
ENDIF()
SET(TLL_LIBS ${HDF5_C_LIBRARY} ${HDF5_HL_LIBRARY} ${TLL_LIBS} ${SZIP_LIBRARY})
ENDIF()
IF(USE_DAP)