From 7490e286e2278b28751a7d3b1789b2779aca216b Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Wed, 8 Dec 2010 12:55:32 -0500 Subject: [svn-r19874] Add other HDF5 configuration variables. --- config/cmake/hdf5-config.cmake.build.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/config/cmake/hdf5-config.cmake.build.in b/config/cmake/hdf5-config.cmake.build.in index 9c8aec3..293ec69 100644 --- a/config/cmake/hdf5-config.cmake.build.in +++ b/config/cmake/hdf5-config.cmake.build.in @@ -7,11 +7,14 @@ GET_FILENAME_COMPONENT (SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) # User Options #----------------------------------------------------------------------------- SET (HDF5_ENABLE_PARALLEL @HDF5_ENABLE_PARALLEL@) +SET (BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@) SET (HDF5_BUILD_FORTRAN @HDF5_BUILD_FORTRAN@) SET (HDF5_BUILD_CPP_LIB @HDF5_BUILD_CPP_LIB@) SET (HDF5_BUILD_TOOLS @HDF5_BUILD_TOOLS@) SET (HDF5_BUILD_HL_LIB @HDF5_BUILD_HL_LIB@) -SET (HDF5_BUILD_HL_CPP_LIB @HDF5_BUILD_HL_CPP_LIB@) +SET (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@) +SET (HDF5_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@) +SET (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@) #----------------------------------------------------------------------------- # Directories @@ -30,9 +33,9 @@ IF (HDF5_BUILD_HL_LIB) SET (HDF5_INCLUDE_DIR_HL ${HDF5_INCLUDE_DIR} ) ENDIF (HDF5_BUILD_HL_LIB) -IF (HDF5_BUILD_HL_CPP_LIB) +IF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB) SET (HDF5_INCLUDE_DIR_HL_CPP ${HDF5_INCLUDE_DIR} ) -ENDIF (HDF5_BUILD_HL_CPP_LIB) +ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB) IF (HDF5_BUILD_TOOLS) SET (HDF5_INCLUDE_DIR_TOOLS ${HDF5_INCLUDE_DIR} ) -- cgit v0.12