summaryrefslogtreecommitdiffstats
path: root/tools/h5import/CMakeLists.txt
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-05-04 19:46:33 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-05-04 19:46:33 (GMT)
commit7706186b2fc3095b5b6e2d8b4f8e4a1c45df3abe (patch)
tree63ff45c29edb39e00c6a44c32618e8c23c7dfbba /tools/h5import/CMakeLists.txt
parentbe60cc1759b1b0907dd23962359077e1d54596c1 (diff)
downloadhdf5-7706186b2fc3095b5b6e2d8b4f8e4a1c45df3abe.zip
hdf5-7706186b2fc3095b5b6e2d8b4f8e4a1c45df3abe.tar.gz
hdf5-7706186b2fc3095b5b6e2d8b4f8e4a1c45df3abe.tar.bz2
[svn-r20722] Refactor ext lib import and install.
Change case of tools subtests to not conflict with tools tests. Add SOVERSION for linux Remove PACKED BITS define/idef blocks Bring r20721 from trunk
Diffstat (limited to 'tools/h5import/CMakeLists.txt')
-rw-r--r--tools/h5import/CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index a2f8a6b..99f8d55 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -135,7 +135,7 @@ IF (BUILD_TESTING)
# If using memchecker add tests without using scripts
IF (NOT HDF5_ENABLE_USING_MEMCHECKER)
ADD_TEST (
- NAME H5IMPORT-H5DUMP-${testname}
+ NAME H5IMPORT-H5DMP-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-D "TEST_ARGS:STRING=${testfile}"
@@ -146,9 +146,9 @@ IF (BUILD_TESTING)
-D "TEST_SKIP_COMPARE=TRUE"
-P "${HDF5_RESOURCES_DIR}/runTest.cmake"
)
- SET_TESTS_PROPERTIES (H5IMPORT-H5DUMP-${testname} PROPERTIES DEPENDS H5IMPORT-${testname})
+ SET_TESTS_PROPERTIES (H5IMPORT-H5DMP-${testname} PROPERTIES DEPENDS H5IMPORT-${testname})
ADD_TEST (
- NAME H5IMPORT-H5DUMP_CMP-${testname}
+ NAME H5IMPORT-H5DMP_CMP-${testname}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:h5dump>"
-D "TEST_ARGS:STRING=testfiles/${testfile}"
@@ -159,8 +159,8 @@ IF (BUILD_TESTING)
-D "TEST_REFERENCE=${testfile}.new"
-P "${HDF5_RESOURCES_DIR}/runTest.cmake"
)
- SET_TESTS_PROPERTIES (H5IMPORT-H5DUMP_CMP-${testname} PROPERTIES DEPENDS H5IMPORT-H5DUMP-${testname})
- SET (last_test "H5IMPORT-H5DUMP_CMP-${testname}")
+ SET_TESTS_PROPERTIES (H5IMPORT-H5DMP_CMP-${testname} PROPERTIES DEPENDS H5IMPORT-H5DMP-${testname})
+ SET (last_test "H5IMPORT-H5DMP_CMP-${testname}")
ENDIF (NOT HDF5_ENABLE_USING_MEMCHECKER)
ENDMACRO (ADD_H5_TEST testname resultcode testfile vparam srcname dstname)