diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-02-17 14:55:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 14:55:42 (GMT) |
| commit | 7cf4913baf1fade3b6095c6f120c882246f94e94 (patch) | |
| tree | 8150f446e97010ac2daa1581a14f66769dfb7908 /CMakeLists.txt | |
| parent | 679bc678cf139232499d90b84e4c575af7d42261 (diff) | |
| download | hdf5-7cf4913baf1fade3b6095c6f120c882246f94e94.zip hdf5-7cf4913baf1fade3b6095c6f120c882246f94e94.tar.gz hdf5-7cf4913baf1fade3b6095c6f120c882246f94e94.tar.bz2 | |
1 10 merge recent changes from develop (#345)
* HDFFV-10865 - merge from dev, HDFArray perf fix.
* Remove duplicate setting
* Whitespace changes after clang format
* Undo version 11 clang format changes
* Merge CMake changes from develop
* test testing script merge from develop
* Update supported platforms
* PR#3 merge from develop
* Merge gcc 10 diagnostics option from develop
* Merge #318 OSX changes from develop
* Merge small changes from develop
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5665f98..0cd8c6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,7 +237,7 @@ string (REGEX REPLACE ".*#define[ \t]+H5_VERS_MINOR[ \t]+([0-9]*).*$" "\\1" H5_VERS_MINOR ${_h5public_h_contents}) string (REGEX REPLACE ".*#define[ \t]+H5_VERS_RELEASE[ \t]+([0-9]*).*$" "\\1" H5_VERS_RELEASE ${_h5public_h_contents}) -string (REGEX REPLACE ".*#define[ \t]+H5_VERS_SUBRELEASE[ \t]+\"([0-9A-Za-z._\-]*)\".*$" +string (REGEX REPLACE ".*#define[ \t]+H5_VERS_SUBRELEASE[ \t]+\"([0-9A-Za-z._-]*)\".*$" "\\1" H5_VERS_SUBRELEASE ${_h5public_h_contents}) if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") message (TRACE "VERSION: ${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}-${H5_VERS_SUBRELEASE}") |