Skip to content

Clean up some obsolete CMake version conditions in CMakeLists.txt. #6104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lrknox wants to merge 2 commits into from
+16 −23
Closed

Clean up some obsolete CMake version conditions in CMakeLists.txt. #6104

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff06eae
Clean up some obsolete CMake version conditions in CMakeLists.txt.
lrknox Dec 11, 2025
b7a1264
Fix typos.
lrknox Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 12 additions & 20 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@
cmake_policy (SET CMP0127 NEW)
endif ()

# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
cmake_policy(SET CMP0135 NEW)
endif()
# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake versions > 3.24:
cmake_policy(SET CMP0135 NEW)

#-----------------------------------------------------------------------------
# Instructions for use : Normal Build
Expand Down Expand Up @@ -86,14 +84,8 @@

# Whether the most recently called project() command, in the current scope or above,
# was in the top level CMakeLists.txt file.
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.21.0")
if(NOT PROJECT_IS_TOP_LEVEL)
set (HDF5_EXTERNALLY_CONFIGURED 1)
endif()
else()
if (NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
set (HDF5_EXTERNALLY_CONFIGURED 1)
endif()
if(NOT PROJECT_IS_TOP_LEVEL)
set (HDF5_EXTERNALLY_CONFIGURED 1)
endif()

#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -519,14 +511,14 @@
set (HDF5_VERSION_STRING ${HDF5_PACKAGE_VERSION})
set (HDF5_VERSION_MAJOR ${HDF5_PACKAGE_VERSION_MAJOR})
set (HDF5_VERSION_MINOR ${HDF5_PACKAGE_VERSION_MINOR})
if (H5_VERS_MAJOR GREATER 1)
if (H5_VERS_MINOR GREATER 9)
set (H5_LIBVER_DIR ${H5_VERS_MAJOR}${H5_VERS_MINOR})
else ()
set (H5_LIBVER_DIR ${H5_VERS_MAJOR}0${H5_VERS_MINOR})
endif()
else ()
# H5_LIBVER_DIR is used in HDF5Examples to compile examples from older hdf5 versions.
# Because the range of minor version numbers exceded single digits, a 0 was needed for

Check failure on line 515 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Check for spelling errors 

exceded ==> exceeded
Copy link

@ellipsis-dev ellipsis-dev bot Dec 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typographical error: "exceded" should be corrected to "exceeded".

Suggested change
# Because the range of minor version numbers exceded single digits, a 0 was needed for
# Because the range of minor version numbers exceeded single digits, a 0 was needed for

# the single digit minor numbers so that version 2.0 (200) will greater than version
Copy link

@ellipsis-dev ellipsis-dev bot Dec 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grammatical error: "will greater than version" should be corrected to "will be greater than version".

Suggested change
# the single digit minor numbers so that version 2.0 (200) will greater than version
# the single digit minor numbers so that version 2.0 (200) will be greater than version

# version 1.14 (114).
if (H5_VERS_MINOR GREATER 9)
set (H5_LIBVER_DIR ${H5_VERS_MAJOR}${H5_VERS_MINOR})
else ()
set (H5_LIBVER_DIR ${H5_VERS_MAJOR}0${H5_VERS_MINOR})
endif()
#-----------------------------------------------------------------------------
# Include some macros for reusable code
Expand Down Expand Up @@ -1211,7 +1203,7 @@
# Include filter plugins
#-----------------------------------------------------------------------------
if (HDF5_ENABLE_PLUGIN_SUPPORT)
if (${H5_LIBVER_DIR} EQUAL 16 OR HDF5_DEFAULT_API_VERSION MATCHES "v16")
if HDF5_DEFAULT_API_VERSION MATCHES "v16")
Copy link

@ellipsis-dev ellipsis-dev bot Dec 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: The if condition is missing an opening parenthesis. It should be if (HDF5_DEFAULT_API_VERSION MATCHES "v16") instead of if HDF5_DEFAULT_API_VERSION MATCHES "v16").

Suggested change
if HDF5_DEFAULT_API_VERSION MATCHES "v16")
if (HDF5_DEFAULT_API_VERSION MATCHES "v16")

set (HDF5_ENABLE_PLUGIN_SUPPORT OFF CACHE BOOL "" FORCE)
message (VERBOSE "Filter PLUGINs cannot be used with 1.6 API")
else ()
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ HDF5 version 2.0.1 currently under development
>
> It's happened—the day we've all been dreading—or eagerly anticipating, depending on your perspective. Yes, we have switched to CMake-only builds in HDF5.
>
> The [PR stripping all autotools](https://github.com/HDFGroup/hdf5/pull/5308) was merged into the "develop" branch on **March 10, 2025**. Starting with HDF5 2.0, *only* the CMake build system is supported.

![HDF5 Logo][u3]

Expand Down Expand Up @@ -92,9 +91,10 @@ HDF5 does not follow a regular release schedule. Instead, updates are based on t
introduction of new features and the resolution of bugs. However, we aim to have at
least one annual release for each maintenance branch.

> The [PR stripping all autotools](https://github.com/HDFGroup/hdf5/pull/5308) was merged into the "develop" branch on **March 10, 2025**. .
Copy link

@ellipsis-dev ellipsis-dev bot Dec 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the extra period after the merge date.

Suggested change
> The [PR stripping all autotools](https://github.com/HDFGroup/hdf5/pull/5308) was merged into the "develop" branch on **March 10, 2025**. .
> The [PR stripping all autotools](https://github.com/HDFGroup/hdf5/pull/5308) was merged into the "develop" branch on **March 10, 2025**.

| Release | New Features |
| ------- | ------------ |
| 2.0.0 | Drop Autotools support, drop the HDF5 <--> GIF tools, add complex number support, update library defaults (cache sizes, etc.) |
| 2.0.0 | Starting with HDF5 2.0, *only* the CMake build system is supported. Dropped the HDF5 <--> GIF tools, added complex number support, updated library defaults (cache sizes, etc.) |
| FUTURE | Multi-threaded HDF5, crashproofing / metadata journaling, Full (VFD) SWMR, encryption, digital signatures, sparse datasets, improved storage for variable-length datatypes, better Unicode support (especially on Windows) |

### Release Progress
Expand Down
3 changes: 2 additions & 1 deletion release_docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ HDF5 version 2.0.1 currently under development
All notable changes to this project will be documented in this file. This document describes the differences between this release and the previous
HDF5 release, platforms tested, and known problems in this release.

For releases prior to version 2.0.0, please see the release.txt file and for more details check the HISTORY*.txt files in the HDF5 source.
For changes in previous releases, please see the HISTORY*.txt files in the HDF5 source.


# 🔗 Quick Links
* [HDF5 documentation](https://support.hdfgroup.org/documentation/hdf5/latest/)
Expand Down
Loading