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 /release_docs | |
| 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 'release_docs')
| -rw-r--r-- | release_docs/RELEASE.txt | 7 | ||||
| -rw-r--r-- | release_docs/USING_HDF5_CMake.txt | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index c2c65ee..ae05653 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -46,6 +46,13 @@ New Features Configuration: ------------- + - Update CMake minimum version to 3.12 + + Updated CMake minimum version to 3.12 and added version checks + for Windows features. + + (ADB - 2020/02/05, TRILABS-142) + - Fixed CMake include properties for Fortran libraries Corrected the library properties for Fortran to use the diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt index 73a24d9..751041d 100644 --- a/release_docs/USING_HDF5_CMake.txt +++ b/release_docs/USING_HDF5_CMake.txt @@ -180,7 +180,7 @@ Given the preconditions in section I, create a CMakeLists.txt file at the source root. Include the following text in the file: ########################################################## -cmake_minimum_required (VERSION 3.10) +cmake_minimum_required (VERSION 3.12) project (HDF5MyApp C CXX) set (LIB_TYPE STATIC) # or SHARED |