summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/h5repack/CMakeLists.txt6
-rw-r--r--tools/lib/CMakeLists.txt36
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