diff options
| author | Brad King <brad.king@kitware.com> | 2024-05-01 13:16:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-05-01 13:16:19 (GMT) |
| commit | 52f1aa10f8d946bbe20903d4878583cd27c271eb (patch) | |
| tree | 05ab3e4d64eba9e20f4192234f8811c25fdae94e | |
| parent | 2ee4ac021008d8abf68f220bd6f29c23ce75fb53 (diff) | |
| parent | 928943f91b7f3e3eee23b227ebf341ed7303ec90 (diff) | |
| download | CMake-52f1aa10f8d946bbe20903d4878583cd27c271eb.zip CMake-52f1aa10f8d946bbe20903d4878583cd27c271eb.tar.gz CMake-52f1aa10f8d946bbe20903d4878583cd27c271eb.tar.bz2 | |
Merge topic 'FindHDF5-version-4-components' into release-3.29
928943f91b FindHDF5: Fix detection of versions with more than three components
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9476
| -rw-r--r-- | Modules/FindHDF5.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index a44c6f9..cc6186f 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -987,7 +987,7 @@ if( NOT HDF5_FOUND ) HDF5_VERSION_DEFINE REGEX "^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+" ) if( "${HDF5_VERSION_DEFINE}" MATCHES - "H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)(-patch([0-9]+))?\"" ) + "H5_VERSION[ \t]+\"([0-9\\.]+)(-patch([0-9]+))?\"" ) set( HDF5_VERSION "${CMAKE_MATCH_1}" ) if( CMAKE_MATCH_3 ) set( HDF5_VERSION ${HDF5_VERSION}.${CMAKE_MATCH_3}) |