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

Changed how HDF5 is located.

Browse Source
This commit is contained in:
Ward Fisher 2012-08-29 21:33:28 +00:00
parent 4a598ea5e5
commit b81dc4373d
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CMakeLists.txt
View File

@ -166,18 +166,25 @@ IF (USE_HDF5 OR ENABLE_NETCDF_4)
SET(USE_HDF5 ON)
SET(USE_NETCDF4 ON)
#FIND_PACKAGE(HDF5)
FIND_LIBRARY(HDF5_LIBRARY NAMES hdf5)
FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hl)
FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
#FIND_LIBRARY(HDF5_LIBRARY NAMES hdf5)
#FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hl)
IF(NOT HDF5_LIBRARY OR NOT HDF5_HL_LIBRARY)
MESSAGE(FATAL_ERROR "HDF5 Not Found.")
ENDIF()
#IF(NOT HDF5_LIBRARIES OR NOT HDF5_HL_LIBRARY)
# MESSAGE(FATAL_ERROR "HDF5 Not Found.")
#ENDIF()
IF(NOT HDF5_FOUND)
MESSAGE(FATAL_ERROR "HDF5 Not Found.")
ELSE()
#MESSAGE(STATUS "HDF5_LIBRARY: ${HDF5_LIBRARY}")
#MESSAGE(STATUS "HDF5_LIBRARIES: ${HDF5_LIBRARIES}")
#MESSAGE(STATUS "HDF5_INCLUDE_DIRS: ${HDF5_INCLUDE_DIRS}")
#MESSAGE(STATUS "HDF5_HL_LIBRARIES: ${HDF5_HL_LIBRARIES}")
ENDIF()
MESSAGE(STATUS "Found HDF5: ${HDF5_LIBRARY}")
MESSAGE(STATUS "Found HDF5_HL: ${HDF5_HL_LIBRARY}")
SET(HDF5_LIBRARIES ${HDF5_LIBRARY} ${HDF5_HL_LIBRARY})
#MESSAGE(STATUS "Found HDF5: ${HDF5_LIBRARIES}")
#MESSAGE(STATUS "Found HDF5_HL: ${HDF5_HL_LIBRARY}")
#SET(HDF5_LIBRARIES ${HDF5_LIBRARY} ${HDF5_HL_LIBRARY})
INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
@ -187,7 +194,12 @@ IF (USE_HDF5 OR ENABLE_NETCDF_4)
#ENDIF(NOT HAVE_HDF5_H)
# Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip.
#CHECK_LIBRARY_EXISTS(${HDF5_LIBRARIES} H5Z_SZIP "" USE_SZIP)
FOREACH(LIB ${HDF5_LIBRARIES})
IF(NOT USE_SZIP)
CHECK_LIBRARY_EXISTS(${LIB} H5Z_SZIP "" USE_SZIP)
ENDIF()
ENDFOREACH()
IF(USE_SZIP)
FIND_PACKAGE(SZIP)
#FIND_LIBRARY(SZIP_LIBRARY NAMES szip sz)

2
liblib/CMakeLists.txt
View File

@ -41,7 +41,7 @@ IF(USE_DAP)
ENDIF()
IF(USE_HDF5 OR USE_NETCDF4)
SET(TLL_LIBS ${TLL_LIBS} ${SZIP_LIBRARY} ${ZLIB_LIBRARY} ${HDF5_LIBRARY} ${HDF5_HL_LIBRARY})
SET(TLL_LIBS ${TLL_LIBS} ${SZIP_LIBRARY} ${ZLIB_LIBRARY} ${HDF5_LIBRARIES})
ENDIF()
IF(ENABLE_PNETCDF AND PNETCDF)