Merge pull request UCL#1668 from KrisThielemans/HDF5_target_workaround

[CMake] depend on both HDF5::HDF5 and hdf5::hdf5_cpp

Author: KrisThielemans

CMakeLists.txt

@@ -157,6 +157,10 @@ if(NOT DISABLE_HDF5)
   if (TARGET HDF5::HDF5)
     option(USE_HDF5_TARGET "Use HDF5::HDF5 CMake target for dependencies (recommended)" ON)
     mark_as_advanced(USE_HDF5_TARGET)
+    # Depend on both HDF5::HDF5 (i.e. all libs just found), and hdf5::hdf5_cpp
+    # (i.e. C++ libs and dependencies). Only the latter should be necessary, but
+    # we need the former due to https://gitlab.kitware.com/cmake/cmake/-/issues/27379
+    set(HDF5_TARGET HDF5::HDF5;hdf5::hdf5_cpp)
     if (HDF5_FIND_DEBUG) # debugging print (re-use name of FindHDF5 CMake variable)
       cmake_print_properties(
         TARGETS HDF5::HDF5

src/CMakeLists.txt

@@ -29,6 +29,11 @@ option(BUILD_EXECUTABLES
 option(BUILD_SHARED_LIBS 
        "Use shared libraries" OFF)
 
+if (BUILD_SHARED_LIBS)
+    # needed explicitly for the registries
+    set(CMAKE_POSITION_INDEPENDENT_CODE True)
+endif()
+       
 ### Settings for external libraries
 
 if (LLN_FOUND)

src/IO/CMakeLists.txt

@@ -104,7 +104,7 @@ endif()
 
 if (HAVE_HDF5)
   if (USE_HDF5_TARGET)
-    target_link_libraries(${TARGET} PUBLIC HDF5::HDF5)
+    target_link_libraries(${TARGET} PUBLIC ${HDF5_TARGET})
   else()
     target_include_directories(${TARGET} PUBLIC ${HDF5_INCLUDE_DIRS})
     target_link_libraries(${TARGET} PUBLIC ${HDF5_CXX_LIBRARIES})

src/buildblock/CMakeLists.txt

@@ -144,7 +144,7 @@ endif()
 
 if (HAVE_HDF5)
   if (USE_HDF5_TARGET)
-    target_link_libraries(${TARGET} PUBLIC HDF5::HDF5)
+    target_link_libraries(${TARGET} PUBLIC ${HDF5_TARGET})
   else()
     # for GEHDF5, TODO remove once IO dependency added or GEHDF5Wrapper no longer includes H5Cpp.h
     target_include_directories(${TARGET} PRIVATE ${HDF5_INCLUDE_DIRS})

src/data_buildblock/CMakeLists.txt

@@ -39,7 +39,7 @@ set(TARGET ${STIR_BUILDBLOCK_LIB})
 
 if (HAVE_HDF5)
   if (USE_HDF5_TARGET)
-    target_link_libraries(${TARGET} PUBLIC HDF5::HDF5)
+    target_link_libraries(${TARGET} PUBLIC ${HDF5_TARGET})
   else()
     # for GEHDF5, TODO remove once IO dependency added or GEHDF5Wrapper no longer includes H5Cpp.h
     target_include_directories(${TARGET} PRIVATE ${HDF5_INCLUDE_DIRS})

src/listmode_buildblock/CMakeLists.txt

@@ -61,7 +61,7 @@ set(TARGET ${STIR_BUILDBLOCK_LIB})
 
 if (HAVE_HDF5)
   if (USE_HDF5_TARGET)
-    target_link_libraries(${TARGET} PUBLIC HDF5::HDF5)
+    target_link_libraries(${TARGET} PUBLIC ${HDF5_TARGET})
   else()
     # for GEHDF5, TODO remove once IO dependency added or GEHDF5Wrapper no longer includes H5Cpp.h
     target_include_directories(${TARGET} PRIVATE ${HDF5_INCLUDE_DIRS})

src/recon_buildblock/CMakeLists.txt

@@ -175,7 +175,7 @@ endif()
 
 if (HAVE_HDF5)
   if (USE_HDF5_TARGET)
-    target_link_libraries(${TARGET} PUBLIC HDF5::HDF5)
+    target_link_libraries(${TARGET} PUBLIC ${HDF5_TARGET})
   else()
     # for GEHDF5, TODO remove once IO dependency added or GEHDF5Wrapper no longer includes H5Cpp.h
     target_include_directories(${TARGET} PRIVATE ${HDF5_INCLUDE_DIRS})