Merge branch 'master' of https://github.com/smistad/FAST

smistad · Feb 29, 2024 · 6b0ac55 · 6b0ac55
2 parents 19eb8d4 + e3a5969
commit 6b0ac55
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/cmake/ModuleHDF5.cmake b/cmake/ModuleHDF5.cmake
@@ -4,28 +4,32 @@ if(FAST_MODULE_HDF5)
         fast_download_dependency(hdf5
                 1.10.11
                 affbe4c3ad9f5467ac8940f53da0d5196450fd1def46ef2cc4d009cd1834d5ce
-                libhdf5.lib libhdf5_cpp.lib
+                libhdf5_cpp.lib libhdf5.lib
         )
     elseif(APPLE)
         if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
 	fast_download_dependency(hdf5
-                1.10.6
-		1cb25e5add41c9ac4d201da1a0edecb0c962a7564da2fe941574c5fed2dba868
-                libhdf5.dylib libhdf5_cpp.dylib
+                1.10.11
+  		eb9cac9cf9b49b35b7681712d3f1a6bb12ea0b54cc772bcd468f812256ce51ef
+                libhdf5_cpp.a libhdf5.a
         )
 
 	else()
         fast_download_dependency(hdf5
-                1.10.6
-                3dfeab5a3143c6f3452629936935810297eba010f706d047ce4da837193ccd2b
-                libhdf5.dylib libhdf5_cpp.dylib
+                1.10.11
+		        97b7fe90182293ad137a8f0b9e7a9c3752ba910966f931da163698de60acffad
+                libhdf5_cpp.a libhdf5.a
         )
 endif()
     else()
+        # Linking order matters on linux with GCC!
+        # libhdf5_cpp.a needs some symbols from libhdf5.a
+        # If libhdf5.a is linked before libhdf5_cpp.a they are discarded
+        # before it knows that libhdf5_cpp.a needs them.
         fast_download_dependency(hdf5
-                1.10.6
-                3582967e130f218861f896675dfe4ddc5807caf203237b99d597af9bf3e8e387
-                libhdf5_cpp.so
-        )
+                1.10.11
+                b4b937d69cc475f7304a2e0d3e44ed74ce1ae8130649d451eaabcdc171cc9077
+                libhdf5_cpp.a libhdf5.a
+            )
     endif()
 endif()