From 01553cb8f7dca506522b4349043348cccecc318e Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 23 May 2012 13:15:08 -0500
Subject: [svn-r22396] Correct missing clean filenames in h5dump make Sync
 518/trunk version and cpack info

---
 CMakeLists.txt           | 21 ++++++---------------
 tools/h5dump/Makefile.am |  2 +-
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b9c2a2..02da1a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -194,7 +194,11 @@ SET (HDF5_PACKAGE_NAME "HDF5")
 SET (HDF5_PACKAGE_VERSION "${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}")
 SET (HDF5_PACKAGE_VERSION_MAJOR "${H5_VERS_MAJOR}.${H5_VERS_MINOR}")
 SET (HDF5_PACKAGE_VERSION_MINOR "${H5_VERS_RELEASE}")
-SET (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}")
+IF (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "")
+  SET (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}-${H5_VERS_SUBRELEASE}")
+ELSE (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "")
+  SET (HDF5_PACKAGE_VERSION_STRING "${HDF5_PACKAGE_VERSION}")
+ENDIF (NOT "${H5_VERS_SUBRELEASE}" STREQUAL "")
 SET (HDF5_PACKAGE_SOVERSION "${H5_SOVERS_MAJOR}.${H5_SOVERS_MINOR}.${H5_SOVERS_RELEASE}")
 SET (HDF5_PACKAGE_STRING "${HDF5_PACKAGE_NAME} ${HDF5_PACKAGE_VERSION_STRING}")
 SET (HDF5_PACKAGE_TARNAME "hdf5")
@@ -439,19 +443,6 @@ IF (CMAKE_COMPILER_IS_GNUCXX)
 ENDIF (CMAKE_COMPILER_IS_GNUCXX)
 
 #-----------------------------------------------------------------------------
-# Use gcc visibility flag.
-#-----------------------------------------------------------------------------
-OPTION (HDF5_ENABLE_VISIBILITY "Enable gcc4 visibility=hidden for Libraries and Programs" OFF)
-IF (HDF5_ENABLE_VISIBILITY)
-  IF (CMAKE_COMPILER_IS_GNUCC)
-    SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
-  ENDIF (CMAKE_COMPILER_IS_GNUCC)
-  IF (CMAKE_COMPILER_IS_GNUCXX)
-    SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-  ENDIF (CMAKE_COMPILER_IS_GNUCXX)
-ENDIF (HDF5_ENABLE_VISIBILITY)
-
-#-----------------------------------------------------------------------------
 # All libs/tests/examples need the main include directories
 #-----------------------------------------------------------------------------
 INCLUDE_DIRECTORIES (${HDF5_BINARY_DIR} ${HDF5_SRC_DIR})
@@ -561,7 +552,7 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT)
         SET (H5_HAVE_LIBZ 1)
         MESSAGE (STATUS "Filter ZLIB is built")
       ELSE (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
-        MESSAGE (FATAL " ZLib is Required for ZLib support in HDF5")
+        MESSAGE (FATAL_ERROR " ZLib is Required for ZLib support in HDF5")
       ENDIF (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "SVN" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
     ENDIF (ZLIB_FOUND)
   ELSE (NOT H5_ZLIB_HEADER)
diff --git a/tools/h5dump/Makefile.am b/tools/h5dump/Makefile.am
index 38864f5..f80d12e 100644
--- a/tools/h5dump/Makefile.am
+++ b/tools/h5dump/Makefile.am
@@ -46,6 +46,6 @@ h5dump_SOURCES=h5dump.c h5dump_ddl.c h5dump_xml.c
 # Temporary files.  *.h5 are generated by h5dumpgentest.  They should
 # copied to the testfiles/ directory if update is required.
 CHECK_CLEANFILES+=*.h5 *.bin
-DISTCLEANFILES=testh5dump.sh
+DISTCLEANFILES=testh5dump.sh testh5dumppbits.sh testh5dumpxml.sh
 
 include $(top_srcdir)/config/conclude.am
-- 
cgit v0.12