diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-08-06 17:53:52 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-08-06 17:53:52 (GMT) |
| commit | 6d22b60931821fd2d3e020f347fa44bd5e520959 (patch) | |
| tree | 9bd621fa01913340377a0622caedad4274afc471 /tools | |
| parent | 5e2d5978e48924c576745ae97e6ecc7203666bf3 (diff) | |
| download | hdf5-6d22b60931821fd2d3e020f347fa44bd5e520959.zip hdf5-6d22b60931821fd2d3e020f347fa44bd5e520959.tar.gz hdf5-6d22b60931821fd2d3e020f347fa44bd5e520959.tar.bz2 | |
[svn-r19183] Corrected h5repack verbose test for windows
Updated tools/lib source dir variable for source list
Tested: local linux
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5repack/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tools/lib/CMakeLists.txt | 36 |
2 files changed, 21 insertions, 21 deletions
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt index a13ab5b..4faef9f 100644 --- a/tools/h5repack/CMakeLists.txt +++ b/tools/h5repack/CMakeLists.txt @@ -198,12 +198,12 @@ IF (BUILD_TESTING) NAME H5REPACK-${testname} COMMAND "${CMAKE_COMMAND}" -D "TEST_PROGRAM=$<TARGET_FILE:h5repack>" - -D "TEST_ARGS:STRING=${ARGN};${PROJECT_BINARY_DIR}/testfiles/${resultfile};${PROJECT_BINARY_DIR}/testfiles/out.${resultfile}" + -D "TEST_ARGS:STRING=${ARGN};testfiles/${resultfile};testfiles/out.${resultfile}" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" -D "TEST_OUTPUT=${resultfile}.out" -D "TEST_EXPECT=${resultcode}" - -D "TEST_FILTER=${testfilter}" - -D "TEST_REFERENCE=${PROJECT_BINARY_DIR}/testfiles/${resultfile}.ddl" + -D "TEST_FILTER:STRING=${testfilter}" + -D "TEST_REFERENCE=testfiles/${resultfile}.ddl" -P "${HDF5_RESOURCES_DIR}/runTest.cmake" ) ENDIF (${testtype} STREQUAL "SKIP") diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index e12a7a6..65548a5 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -8,27 +8,27 @@ PROJECT (HDF5_TOOLS_LIB) #INCLUDE_DIRECTORIES (${HDF5_PROJECT_DIR}/test) SET (H5_TOOLS_LIB_SRCS - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_array.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_attr.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_dset.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff_util.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_filters.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_type.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.c - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_array.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_attr.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_dset.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_util.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_filters.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_ref.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_str.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_type.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_utils.c + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5trav.c ) SET (H5_TOOLS_LIB_HDRS - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5trav.h - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools.h - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_utils.h - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_str.h - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5tools_ref.h - ${HDF5_TOOLS_SOURCE_DIR}/lib/h5diff.h + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5trav.h + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools.h + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_utils.h + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_str.h + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5tools_ref.h + ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.h ) #-- Always build a static library for linking the ${HDF5_LIB_NAME} tools together |