From eb0cc7a5765b3b8b5d91da665e70c86e0b782c5d Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 20 Aug 2010 11:01:45 -0500 Subject: [svn-r19266] Remove configuration of cmake zlib config filed which has been deleted. Correct naming of SKIP test Tested: local linux --- CMakeLists.txt | 1 - tools/h5dump/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20c601d..0d49b20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -446,7 +446,6 @@ IF (HDF5_ENABLE_Z_LIB_SUPPORT) SET (H5_HAVE_ZLIB_H 1) SET (H5_HAVE_LIBZ 1) ENDIF (NOT H5_ZLIB_HEADER) - CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/hdf5_zlib.h.in ${HDF5_BINARY_DIR}/hdf5_zlib.h @ONLY) SET (LINK_LIBS ${LINK_LIBS} ${ZLIB_LIBRARIES}) INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS}) MESSAGE (STATUS "Filter ZLIB is ON") diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index 04d246c..fee9b8a 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -327,7 +327,7 @@ IF (BUILD_TESTING) MACRO (ADD_SKIP_H5_TEST skipresultfile skipresultcode testtype) IF (${testtype} STREQUAL "SKIP") ADD_TEST ( - NAME H5REPACK-${testname} + NAME H5DUMP-${skipresultfile} COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${skipresultfile} ${ARGN}" ) ELSE (${testtype} STREQUAL "SKIP") -- cgit v0.12