diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2015-03-05 16:48:32 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2015-03-05 16:48:32 (GMT) |
| commit | ece0ba0336d8e8a620af757833411eadbe068503 (patch) | |
| tree | d934b6d5275461cd1029ef055a488815d535e9e4 /tools/h5diff | |
| parent | 5a7ad19248277b9c448894b8984cdde4cc3924dd (diff) | |
| download | hdf5-ece0ba0336d8e8a620af757833411eadbe068503.zip hdf5-ece0ba0336d8e8a620af757833411eadbe068503.tar.gz hdf5-ece0ba0336d8e8a620af757833411eadbe068503.tar.bz2 | |
[svn-r26371] Update cmake mininum version
Update windows wix cpack process.
Diffstat (limited to 'tools/h5diff')
| -rw-r--r-- | tools/h5diff/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/h5diff/CMakeTests.cmake | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt index 35c55a4..f539d20 100644 --- a/tools/h5diff/CMakeLists.txt +++ b/tools/h5diff/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.11) +cmake_minimum_required (VERSION 3.1.0) PROJECT (HDF5_TOOLS_H5DIFF) #----------------------------------------------------------------------------- diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake index 686803b..c650dbe 100644 --- a/tools/h5diff/CMakeTests.cmake +++ b/tools/h5diff/CMakeTests.cmake @@ -1072,12 +1072,7 @@ ADD_H5_TEST (h5diff_80 1 -v ${FILE7} ${FILE8}) ADD_H5_TEST (h5diff_90 0 -v ${FILE2} ${FILE2}) # 10. read by hyperslab, print indexes -#if test -n "$pmode" -a "$mydomainname" = hdfgroup.uiuc.edu; then -# # skip this test which sometimes hangs in some THG machines -# message (STATUS "SKIP -v ${FILE9} ${FILE10}) -#else -# ADD_H5_TEST (h5diff_100 1 -v ${FILE9} ${FILE10}) -#fi +ADD_H5_TEST (h5diff_100 1 -v ${FILE9} ${FILE10}) # 11. floating point comparison ADD_H5_TEST (h5diff_101 1 -v ${FILE1} ${FILE1} g1/d1 g1/d2) |