summaryrefslogtreecommitdiffstats
path: root/hl/test
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-02-22 12:16:30 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-02-22 12:16:30 (GMT)
commitc07d8036591313caf15cf626122bd7ce4e61be49 (patch)
treede3cfcb2639a3c84254d536d2f4a1ec9239af019 /hl/test
parent179f3b7879e28165869034255b5852b551700ad6 (diff)
parentf634105bdb7c494a5ab39291d64c00676c11b476 (diff)
downloadhdf5-c07d8036591313caf15cf626122bd7ce4e61be49.zip
hdf5-c07d8036591313caf15cf626122bd7ce4e61be49.tar.gz
hdf5-c07d8036591313caf15cf626122bd7ce4e61be49.tar.bz2
[svn-r26274] Merge of r26096 to r26271 from trunk.
Tested on: jam - serial: C++/Fortran parallel: Fortran
Diffstat (limited to 'hl/test')
-rw-r--r--hl/test/CMakeLists.txt2
-rw-r--r--hl/test/dectris_hl_perf.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/hl/test/CMakeLists.txt b/hl/test/CMakeLists.txt
index 545210b..28c716c 100644
--- a/hl/test/CMakeLists.txt
+++ b/hl/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.1.0)
PROJECT (HDF5_HL_TEST)
# --------------------------------------------------------------------
# Notes: When creating unit test executables they should be prefixed
diff --git a/hl/test/dectris_hl_perf.c b/hl/test/dectris_hl_perf.c
index a3e382a..d62926a 100644
--- a/hl/test/dectris_hl_perf.c
+++ b/hl/test/dectris_hl_perf.c
@@ -18,7 +18,6 @@
*
*/
-#include "hdf5.h"
#include "hdf5_hl.h"
#include <zlib.h>
#include <math.h>