[visit] 01/01: Fix for cmake find hdf5

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository visit.

commit e2d534ec4b5aecb306672d1845e80c85a30c706e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jun 13 14:11:50 2015 +0100

    Fix for cmake find hdf5
---
 debian/debian.cmake.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/debian.cmake.in b/debian/debian.cmake.in
index c6ee752..27930f9 100644
--- a/debian/debian.cmake.in
+++ b/debian/debian.cmake.in
@@ -9,6 +9,7 @@ SET(DEBIAN TRUE)
 SET(BUILD_PREFIX /usr)
 SET(DEB_HOST_MULTIARCH @DEB_HOST_MULTIARCH@)
 SET(CMAKE_INSTALL_PREFIX ${VISITHOME}/debian/tmp/usr)
+SET(HDF5_FLAVOR serial)
 
 # Specify the Qt4 binary dir. 
 # (qmake us used to locate & setup Qt4 dependencies)
@@ -39,8 +40,8 @@ VISIT_OPTION_DEFAULT(VISIT_CGNS_DIR ${BUILD_PREFIX})
 VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${BUILD_PREFIX})
 VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP ${BUILD_PREFIX}/lib jpeg)
 VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${BUILD_PREFIX})
-VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${BUILD_PREFIX})
-VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${BUILD_PREFIX}/lib z)
+VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${BUILD_PREFIX}/lib/${DEB_HOST_MULTIARCH}/hdf5/${HDF5_FLAVOR})
+VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${BUILD_PREFIX}/lib/${DEB_HOST_MULTIARCH} z)
 VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${BUILD_PREFIX})
 VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${BUILD_PREFIX})
 VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visit.git