Commit 496db182 authored by Dave DeMarle's avatar Dave DeMarle
Browse files

Fix netcdf4's compilation dependency on hdf5.

vtk's config magic wasn't getting the options and thus the
interlib resources right the first time. Thus the dashboards,
which have a single cmake pass, would fail but this unlucky
developers machine wouldn't.

The change should also make extrnal hdf5 option work when it
probably wouldn't before.
parent 18372c52
......@@ -20,6 +20,7 @@ IF(NOT VTK_USE_SYSTEM_HDF5)
SET(HDF5_INSTALL_INCLUDE_DIR ${VTK_INSTALL_INCLUDE_DIR})
SET(HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)
SET(HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE)
# Setup all necessary overrides for zlib so that HDF5 uses our
# internally compiled zlib rather than any other version
......@@ -37,6 +38,8 @@ IF(NOT VTK_USE_SYSTEM_HDF5)
ENDIF(VTK_USE_SYSTEM_ZLIB)
ENDIF(HDF5_ENABLE_Z_LIB_SUPPORT)
LIST(APPEND VTK_HDF5_LIBRARIES vtkhdf5_hl)
MARK_AS_ADVANCED(
H5_SET_LIB_OPTIONS
H5_LEGACY_NAMING
......
......@@ -544,7 +544,7 @@ ENDIF(0)
#-----------------------------------------------------------------------------
# Option to build High Level API's
#-----------------------------------------------------------------------------
OPTION (HDF5_BUILD_HL_LIB "Build HIGH Level HDF5 Library" ON)
OPTION (HDF5_BUILD_HL_LIB "Build HIGH Level HDF5 Library" OFF)
IF (HDF5_BUILD_HL_LIB)
SET (H5_INCLUDE_HL 1)
ADD_SUBDIRECTORY (${HDF5_SOURCE_DIR}/hl ${PROJECT_BINARY_DIR}/hl)
......
......@@ -300,7 +300,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/libsrc
${CMAKE_CURRENT_SOURCE_DIR}/libsrc4
${CMAKE_CURRENT_BINARY_DIR}
${HDF5_INCLUDE_DIR}
${VTK_HDF5_INCLUDE_DIR}
)
set(netcdf_liblib_SOURCES "" CACHE INTERNAL "" FORCE)
......@@ -335,7 +335,7 @@ VTK_ADD_LIBRARY(vtkNetCDF
${netcdf_dispatch_SOURCES}
${netcdf_liblib_SOURCES})
IF (NETCDF_ENABLE_NETCDF4)
TARGET_LINK_LIBRARIES(vtkNetCDF vtkhdf5 vtkhdf5_hl)
TARGET_LINK_LIBRARIES(vtkNetCDF ${VTK_HDF5_LIBRARIES})
ENDIF (NETCDF_ENABLE_NETCDF4)
VTK_ADD_LIBRARY(vtkNetCDF_cxx ${netcdf_cxx_SOURCES})
......
......@@ -206,9 +206,7 @@ ENDIF(VTK_USE_METAIO)
VTK_THIRD_PARTY_INCLUDE(VERDICT verdict)
VTK_THIRD_PARTY_INCLUDE(HDF5 vtkhdf5)
VTK_THIRD_PARTY_INCLUDE(HDF5 vtkhdf5/src)
IF(HDF5_BUILD_HL_LIB)
VTK_THIRD_PARTY_INCLUDE(HDF5 vtkhdf5/hl/src)
ENDIF(HDF5_BUILD_HL_LIB)
VTK_THIRD_PARTY_INCLUDE(HDF5 vtkhdf5/hl/src)
IF(VTK_USE_PARALLEL)
VTK_THIRD_PARTY_INCLUDE(Cosmo Cosmo)
VTK_THIRD_PARTY_INCLUDE(VPIC VPIC)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment