diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-02-24 13:50:16 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2020-02-24 13:50:16 (GMT) |
commit | 8544c6b3993c1ca08a94a6cdd889fc994cce9516 (patch) | |
tree | 5b50d88ba9b0b6c9478091b3f13ba792111f60a3 /src | |
parent | 3a0c562aeaa9f5572b02dbfe2f7347bb2ed48a4d (diff) | |
parent | 5b5ff6ee094033f2ecd974b8e0bdaac2b0c7e617 (diff) | |
download | hdf5-8544c6b3993c1ca08a94a6cdd889fc994cce9516.zip hdf5-8544c6b3993c1ca08a94a6cdd889fc994cce9516.tar.gz hdf5-8544c6b3993c1ca08a94a6cdd889fc994cce9516.tar.bz2 |
Merge pull request #2391 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to hdf5_1_12
* commit '5b5ff6ee094033f2ecd974b8e0bdaac2b0c7e617':
Correct usage of add_compile_definitions
Merge changes from develop mostly cmake 3.12 minimum version
Merge changes from develop for CMake and Java
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 070cf62..f582056 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.10) +cmake_minimum_required (VERSION 3.12) project (HDF5_SRC C) #----------------------------------------------------------------------------- |