Skip to content
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.

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

Prefix DEFAULT_API_VERSION with HDF5_ in CMake #4982

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -857,9 +857,16 @@ if (HDF5_ENABLE_SUBFILING_VFD)
endif()
endif()

# Select the default API version
set (HDF5_DEFAULT_API_VERSION "v118" CACHE STRING "Enable v1.16 API (v16, v18, v110, v112, v114, v116, v118)")
set_property (CACHE HDF5_DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110 v112 v114 v116 v118)

set (DEFAULT_API_VERSION "v118" CACHE STRING "Enable v1.16 API (v16, v18, v110, v112, v114, v116, v118)")
set_property (CACHE DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110 v112 v114 v116 v118)
# Most of the configure code uses DEFAULT_API_VERSION, so just set that
# to be the same value as the HDF5_ option. We can use HDF5_DEFAULT_API_VERSION
# when the Autotools go away.
if (HDF5_DEFAULT_API_VERSION)
set (DEFAULT_API_VERSION ${HDF5_DEFAULT_API_VERSION})
endif ()
#-----------------------------------------------------------------------------
# Option to use 1.6.x API
#-----------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ New Features

Configuration:
-------------
- Renamed DEFAULT_API_VERSION to HDF5_DEFAULT_API_VERSION in CMake

All other HDF5 library CMake options are prefixed with HDF5_

- Dropped support for the traditional MSVC preprocessor

Visual Studio has recently started using a standards-compliant
Expand Down
Loading