summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-11-27 18:38:51 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-11-27 18:38:51 (GMT)
commitf8b3d669da67b38addad86ebf1c8a198fdbb65d7 (patch)
treed08f91ff9d9e7ab14d1452051ac8254e77f95d39
parent51fd60955b890ab8bc35d6688ddf8f56e98bdcef (diff)
downloadhdf5-f8b3d669da67b38addad86ebf1c8a198fdbb65d7.zip
hdf5-f8b3d669da67b38addad86ebf1c8a198fdbb65d7.tar.gz
hdf5-f8b3d669da67b38addad86ebf1c8a198fdbb65d7.tar.bz2
[svn-r19854] Correct external library generated headers packing for install/cpack when not using svn builds
-rw-r--r--CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b80ee7..0b3985b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -482,6 +482,7 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT)
SET (H5_HAVE_ZLIB_H 1)
SET (H5_HAVE_LIBZ 1)
SET (H5_ZLIB_HEADER "zlib.h")
+ SET (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR})
ELSE (ZLIB_FOUND)
IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
EXTERNALPROJECT_ADD (ZLIB
@@ -558,6 +559,7 @@ IF (HDF5_ENABLE_SZIP_SUPPORT)
SET (H5_HAVE_FILTER_SZIP 1)
SET (H5_HAVE_SZLIB_H 1)
SET (H5_HAVE_LIBSZ 1)
+ SET (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR})
ELSE (SZIP_FOUND)
IF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN")
EXTERNALPROJECT_ADD (SZIP