hdf5.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. diff --git a/Modules/ThirdParty/HDF5/CMakeLists.txt b/Modules/ThirdParty/HDF5/CMakeLists.txt
  2. index dcaa2fa..cc4d6ea 100644
  3. --- a/Modules/ThirdParty/HDF5/CMakeLists.txt
  4. +++ b/Modules/ThirdParty/HDF5/CMakeLists.txt
  5. @@ -39,7 +39,6 @@ if(NOT ITK_BINARY_DIR)
  6. endif()
  7. ")
  8. - if(BUILD_SHARED_LIBS)
  9. if (TARGET hdf5-shared)
  10. set(ITKHDF5_LIBRARIES hdf5_cpp-shared hdf5-shared hdf5_hl-shared)
  11. elseif(TARGET hdf5::hdf5-shared)
  12. @@ -49,7 +48,6 @@ endif()
  13. else()
  14. set(ITKHDF5_LIBRARIES ${HDF5_C_SHARED_LIBRARY} ${HDF5_CXX_SHARED_LIBRARY} ${HDF5_CXX_LIBRARY_NAMES} ${HDF5_HL_SHARED_LIBRARY} ${HDF5_LIBRARIES})
  15. endif()
  16. - else()
  17. if (TARGET hdf5-static)
  18. set(ITKHDF5_LIBRARIES hdf5_cpp-static hdf5-static hdf5_hl-static)
  19. elseif(TARGET hdf5::hdf5-static)
  20. @@ -59,7 +57,6 @@ endif()
  21. else()
  22. set(ITKHDF5_LIBRARIES ${HDF5_C_STATIC_LIBRARY} ${HDF5_CXX_STATIC_LIBRARY} ${HDF5_CXX_LIBRARY_NAMES} ${HDF5_HL_STATIC_LIBRARY} ${HDF5_LIBRARIES})
  23. endif()
  24. - endif()
  25. set(ITKHDF5_INCLUDE_DIRS
  26. ${ITKHDF5_BINARY_DIR}/src # itk_hdf5.h and itk_H5Cpp.h
  27. diff --git a/Modules/ThirdParty/HDF5/itk-module-init.cmake b/Modules/ThirdParty/HDF5/itk-module-init.cmake
  28. index 93604eb..74cc73c 100644
  29. --- a/Modules/ThirdParty/HDF5/itk-module-init.cmake
  30. +++ b/Modules/ThirdParty/HDF5/itk-module-init.cmake
  31. @@ -3,11 +3,7 @@ mark_as_advanced(ITK_USE_SYSTEM_HDF5)
  32. if(ITK_USE_SYSTEM_HDF5)
  33. set(HDF5_NO_MODULE 1)
  34. - if(ITK_BUILD_SHARED_LIBS)
  35. - find_package(HDF5 QUIET NO_MODULE COMPONENTS CXX C HL shared)
  36. - else()
  37. - find_package(HDF5 QUIET NO_MODULE COMPONENTS CXX C HL static)
  38. - endif()
  39. + find_package(HDF5 CONFIG REQUIRED)
  40. if(NOT HDF5_FOUND)
  41. find_package(HDF5 REQUIRED COMPONENTS CXX C HL)