diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2012-07-06 19:16:07 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2012-07-06 19:16:07 (GMT) |
commit | 046f1d7b1fd29c3caea904d3aa403fa4e9cae4b8 (patch) | |
tree | b932e36d4f7f428eed97a5e8b57137050f27ebb6 /tools/h5stat | |
parent | 3fef275c89ef954eb44929ede39b3a3926d61292 (diff) | |
download | hdf5-046f1d7b1fd29c3caea904d3aa403fa4e9cae4b8.zip hdf5-046f1d7b1fd29c3caea904d3aa403fa4e9cae4b8.tar.gz hdf5-046f1d7b1fd29c3caea904d3aa403fa4e9cae4b8.tar.bz2 |
[svn-r22522] Merge trunk revision 22520 cmake files and h5dump/h5diff and configure to branch
Diffstat (limited to 'tools/h5stat')
-rw-r--r-- | tools/h5stat/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt index 8c621c9..1f19ca0 100644 --- a/tools/h5stat/CMakeLists.txt +++ b/tools/h5stat/CMakeLists.txt @@ -92,6 +92,9 @@ IF (BUILD_TESTING) # If using memchecker add tests without using scripts IF (HDF5_ENABLE_USING_MEMCHECKER) ADD_TEST (NAME H5STAT-${resultfile} COMMAND $<TARGET_FILE:h5stat> ${ARGN}) + IF (NOT ${resultcode} STREQUAL "0") + SET_TESTS_PROPERTIES (H5STAT-${resultfile} PROPERTIES WILL_FAIL "true") + ENDIF (NOT ${resultcode} STREQUAL "0") IF (NOT "${last_test}" STREQUAL "") SET_TESTS_PROPERTIES (H5STAT-${resultfile} PROPERTIES DEPENDS ${last_test}) ENDIF (NOT "${last_test}" STREQUAL "") @@ -196,11 +199,14 @@ ENDIF (BUILD_TESTING) #-----------------------------------------------------------------------------
# Rules for Installation of tools using make Install target
#-----------------------------------------------------------------------------
+ +INSTALL_PROGRAM_PDB (h5stat ${HDF5_INSTALL_BIN_DIR} toolsapplications) + INSTALL ( TARGETS h5stat RUNTIME DESTINATION - ${HDF5_INSTALL_BIN_DIR}/tools + ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications ) |