#1676 #1388 Windows : Add path to HDF5 files and link with HDF5 static libs

This commit is contained in:
Magne Sjaastad 2017-08-08 07:07:22 +02:00
parent ca1e08a1a4
commit bc4edf6db3

View File

@ -179,8 +179,26 @@ add_subdirectory(GeoMech/GeoMechDataModel)
#
# HDF5
#
option(RESINSIGHT_ENABLE_HDF5 "Use HDF5" OFF)
if(RESINSIGHT_ENABLE_HDF5)
if(MSVC)
# Must specyfy libraries manually
# Using find_package causes linking of zlib, and crashes with linking of zlib defined by Qt
set(RESINSIGHT_HDF5_INCLUDE_DIR "" CACHE PATH "Path to HDF5 includes")
set(RESINSIGHT_HDF5_LIBRARY_DIR "" CACHE PATH "Path to HDF5 libraries")
include_directories(${RESINSIGHT_HDF5_INCLUDE_DIR})
list(APPEND THIRD_PARTY_LIBRARIES
# libzlib.lib is not included here, as it is linked implicitly by Qt
${RESINSIGHT_HDF5_LIBRARY_DIR}/libhdf5.lib
${RESINSIGHT_HDF5_LIBRARY_DIR}/libhdf5_cpp.lib
${RESINSIGHT_HDF5_LIBRARY_DIR}/libszip.lib
)
else()
add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
find_package(HDF5 REQUIRED COMPONENTS CXX)
if (HDF5_FOUND)
@ -190,6 +208,8 @@ if(RESINSIGHT_ENABLE_HDF5)
list(APPEND THIRD_PARTY_LIBRARIES
${HDF5_LIBRARIES}
)
endif()
endif()
list( APPEND CPP_SOURCES
FileInterface/RifHdf5Reader.h
@ -199,9 +219,6 @@ if(RESINSIGHT_ENABLE_HDF5)
source_group( "FileInterface" FILES FileInterface/RifHdf5Reader.h FileInterface/RifHdf5Reader.cpp )
add_definitions(-DUSE_HDF5)
# TODO add_subdirectory(HDF/Hdf5Reader)
message( STATUS "Linking HD5 libraries : ${HDF5_LIBRARIES}" )
endif()
endif()
#############################################################################