summaryrefslogtreecommitdiffstats
path: root/config/cmake/hdf5-config.cmake.install.in
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-12-08 20:55:25 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-12-08 20:55:25 (GMT)
commit624ab27d3819de07fb1d3016e13f2ce2e6381c7e (patch)
treee34b1c756996566cd22b9cb1ef3c809df7268c86 /config/cmake/hdf5-config.cmake.install.in
parent42c56b94492a3e06bc71739d162b2bb9ad392b26 (diff)
downloadhdf5-624ab27d3819de07fb1d3016e13f2ce2e6381c7e.zip
hdf5-624ab27d3819de07fb1d3016e13f2ce2e6381c7e.tar.gz
hdf5-624ab27d3819de07fb1d3016e13f2ce2e6381c7e.tar.bz2
[svn-r19878] Correct HDF5 configuration variables for CPack/Install.
Bring r19875 from 1.8 branch
Diffstat (limited to 'config/cmake/hdf5-config.cmake.install.in')
-rw-r--r--config/cmake/hdf5-config.cmake.install.in13
1 files changed, 8 insertions, 5 deletions
diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in
index 8a1bffb..dadbeb6 100644
--- a/config/cmake/hdf5-config.cmake.install.in
+++ b/config/cmake/hdf5-config.cmake.install.in
@@ -11,7 +11,10 @@ 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@)
+SET (BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
#-----------------------------------------------------------------------------
# Directories
@@ -26,14 +29,14 @@ IF (HDF5_BUILD_CPP_LIB)
SET (HDF5_INCLUDE_DIR_CPP "@CMAKE_INSTALL_PREFIX@/include/cpp" )
ENDIF (HDF5_BUILD_CPP_LIB)
-IF (HDF5_BUILD_HL_CPP_LIB)
- SET (HDF5_INCLUDE_DIR_HL_CPP "@CMAKE_INSTALL_PREFIX@/include/hl/cpp" )
-ENDIF (HDF5_BUILD_HL_CPP_LIB)
-
IF (HDF5_BUILD_HL_LIB)
SET (HDF5_INCLUDE_DIR_HL "@CMAKE_INSTALL_PREFIX@/include/hl" )
ENDIF (HDF5_BUILD_HL_LIB)
+IF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)
+ SET (HDF5_INCLUDE_DIR_HL_CPP "@CMAKE_INSTALL_PREFIX@/include/hl/cpp" )
+ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)
+
IF (HDF5_BUILD_TOOLS)
SET (HDF5_INCLUDE_DIR_TOOLS "@CMAKE_INSTALL_PREFIX@/include/tools" )
ENDIF (HDF5_BUILD_TOOLS)