Просмотр исходного кода

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 <[email protected]>
Merge-request: !9476
Brad King 1 год назад
Родитель
Сommit
52f1aa10f8
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      Modules/FindHDF5.cmake

+ 1 - 1
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})