deps.patch 5.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173
  1. diff --git a/CMake/FindEXPAT.cmake b/CMake/FindEXPAT.cmake
  2. index 00b160a4..7cdc1fe0 100644
  3. --- a/CMake/FindEXPAT.cmake
  4. +++ b/CMake/FindEXPAT.cmake
  5. @@ -37,7 +37,7 @@ pkg_check_modules(PC_EXPAT QUIET expat)
  6. find_path(EXPAT_INCLUDE_DIR NAMES expat.h HINTS ${PC_EXPAT_INCLUDE_DIRS})
  7. # Look for the library.
  8. -find_library(EXPAT_LIBRARY NAMES expat libexpat HINTS ${PC_EXPAT_LIBRARY_DIRS})
  9. +find_library(EXPAT_LIBRARY NAMES expat libexpat libexpatMD libexpatMT libexpatMDd libexpatMTd HINTS ${PC_EXPAT_LIBRARY_DIRS})
  10. if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h")
  11. file(STRINGS "${EXPAT_INCLUDE_DIR}/expat.h" expat_version_str
  12. diff --git a/CMake/FindLibXml2.cmake b/CMake/FindLibXml2.cmake
  13. index b1942d85..2c26a04d 100644
  14. --- a/CMake/FindLibXml2.cmake
  15. +++ b/CMake/FindLibXml2.cmake
  16. @@ -64,7 +64,7 @@ if(DEFINED LIBXML2_LIBRARIES AND NOT DEFINED LIBXML2_LIBRARY)
  17. set(LIBXML2_LIBRARY ${LIBXML2_LIBRARIES})
  18. endif()
  19. -find_library(LIBXML2_LIBRARY NAMES xml2 libxml2
  20. +find_library(LIBXML2_LIBRARY NAMES xml2 libxml2 libxml2s
  21. HINTS
  22. ${PC_LIBXML_LIBDIR}
  23. ${PC_LIBXML_LIBRARY_DIRS}
  24. diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake
  25. index fbc3e15a..88d995b9 100644
  26. --- a/CMake/FindPEGTL.cmake
  27. +++ b/CMake/FindPEGTL.cmake
  28. @@ -21,13 +21,12 @@
  29. # PEGTL::PEGTL
  30. find_path(PEGTL_INCLUDE_DIR
  31. - NAMES pegtl/version.hpp
  32. - PATH_SUFFIXES tao
  33. + NAMES tao/pegtl/version.hpp
  34. DOC "Path to PEGTL headers")
  35. mark_as_advanced(PEGTL_INCLUDE_DIR)
  36. if (PEGTL_INCLUDE_DIR)
  37. - file(STRINGS "${PEGTL_INCLUDE_DIR}/pegtl/version.hpp" _pegtl_version_header
  38. + file(STRINGS "${PEGTL_INCLUDE_DIR}/tao/pegtl/version.hpp" _pegtl_version_header
  39. REGEX "TAO_PEGTL_VERSION")
  40. string(REGEX MATCH "define[ \t]+TAO_PEGTL_VERSION[ \t]+\"([0-9.]+)\"" _pegtl_version_match "${_pegtl_version_header}")
  41. set(PEGTL_VERSION "${CMAKE_MATCH_1}")
  42. diff --git a/CMake/FindTHEORA.cmake b/CMake/FindTHEORA.cmake
  43. index 7a3eeced..f3bc2184 100644
  44. --- a/CMake/FindTHEORA.cmake
  45. +++ b/CMake/FindTHEORA.cmake
  46. @@ -10,7 +10,7 @@ set(THEORA_required_libs THEORA_LIBRARY)
  47. find_library(THEORA_LIBRARY
  48. NAMES
  49. - theora
  50. + theora theoraenc theoradec
  51. HINTS
  52. "${computed_theora_root}/lib"
  53. "${computed_theora_root}/lib64"
  54. diff --git a/CMakeLists.txt b/CMakeLists.txt
  55. index 89522070..8fe3e0af 100644
  56. --- a/CMakeLists.txt
  57. +++ b/CMakeLists.txt
  58. @@ -26,6 +26,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
  59. endif ()
  60. endif ()
  61. +# find hdf5 here to avoid issues of missing it later after vtk_module_third_party()
  62. +find_package(hdf5 CONFIG REQUIRED)
  63. # must be before the following iOS / Android
  64. find_package(Git QUIET)
  65. include(VTKDetermineVersion)
  66. diff --git a/ThirdParty/exodusII/CMakeLists.txt b/ThirdParty/exodusII/CMakeLists.txt
  67. index 8d1a03ca..7ec6257b 100644
  68. --- a/ThirdParty/exodusII/CMakeLists.txt
  69. +++ b/ThirdParty/exodusII/CMakeLists.txt
  70. @@ -1,15 +1,20 @@
  71. -vtk_module_third_party_internal(
  72. - LICENSE_FILES
  73. - "vtkexodusII/COPYRIGHT"
  74. - SPDX_LICENSE_IDENTIFIER
  75. - "BSD-3-Clause"
  76. - SPDX_COPYRIGHT_TEXT
  77. - "Copyright (c) 2005-2017 National Technology & Engineering Solutions of Sandia, LLC (NTESS)"
  78. - SPDX_DOWNLOAD_LOCATION
  79. - "git+https://gitlab.kitware.com/third-party/seacas.git@exodus/for/vtk-20250313-v2025-02-27#packages/seacas/libraries/exodus"
  80. - VERSION
  81. - "9.0.4"
  82. - STANDARD_INCLUDE_DIRS)
  83. +vtk_module_third_party(
  84. + INTERNAL
  85. + LICENSE_FILES
  86. + "vtkexodusII/COPYRIGHT"
  87. + SPDX_LICENSE_IDENTIFIER
  88. + "BSD-3-Clause"
  89. + SPDX_COPYRIGHT_TEXT
  90. + "Copyright (c) 2005-2017 National Technology & Engineering Solutions of Sandia, LLC (NTESS)"
  91. + SPDX_DOWNLOAD_LOCATION
  92. + "git+https://gitlab.kitware.com/third-party/seacas.git@exodus/for/vtk-20250313-v2025-02-27#packages/seacas/libraries/exodus"
  93. + VERSION
  94. + "9.0.4"
  95. + STANDARD_INCLUDE_DIRS
  96. + EXTERNAL
  97. + PACKAGE SEACASExodus
  98. + TARGETS SEACASExodus::exodus
  99. + STANDARD_INCLUDE_DIRS)
  100. #configure_file(
  101. # "${CMAKE_CURRENT_SOURCE_DIR}/vtk_exodusII.h.in"
  102. diff --git a/ThirdParty/exodusII/vtk_exodusII.h b/ThirdParty/exodusII/vtk_exodusII.h
  103. index e485cc49..b16509c1 100644
  104. --- a/ThirdParty/exodusII/vtk_exodusII.h
  105. +++ b/ThirdParty/exodusII/vtk_exodusII.h
  106. @@ -4,6 +4,6 @@
  107. #define vtk_exodusII_h
  108. /* Use the exodusII library configured for VTK. */
  109. -#include <vtkexodusII/include/exodusII.h>
  110. +#include <exodusII.h>
  111. #endif
  112. diff --git a/ThirdParty/expat/CMakeLists.txt b/ThirdParty/expat/CMakeLists.txt
  113. index 81d65a77..2a8c4aed 100644
  114. --- a/ThirdParty/expat/CMakeLists.txt
  115. +++ b/ThirdParty/expat/CMakeLists.txt
  116. @@ -14,7 +14,6 @@ vtk_module_third_party(
  117. STANDARD_INCLUDE_DIRS
  118. EXTERNAL
  119. PACKAGE EXPAT
  120. - VERSION 2.5.0
  121. TARGETS EXPAT::EXPAT
  122. STANDARD_INCLUDE_DIRS)
  123. diff --git a/ThirdParty/fast_float/CMakeLists.txt b/ThirdParty/fast_float/CMakeLists.txt
  124. index 6ee6388e..1536828e 100644
  125. --- a/ThirdParty/fast_float/CMakeLists.txt
  126. +++ b/ThirdParty/fast_float/CMakeLists.txt
  127. @@ -13,7 +13,6 @@ vtk_module_third_party(
  128. STANDARD_INCLUDE_DIRS
  129. HEADER_ONLY
  130. EXTERNAL
  131. - VERSION "7.0.0"
  132. PACKAGE FastFloat
  133. TARGETS FastFloat::fast_float
  134. STANDARD_INCLUDE_DIRS
  135. diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt
  136. index c3513d99..8ee46a6c 100644
  137. --- a/ThirdParty/libharu/CMakeLists.txt
  138. +++ b/ThirdParty/libharu/CMakeLists.txt
  139. @@ -21,10 +21,19 @@ vtk_module_third_party(
  140. include(vtkDetectLibraryType)
  141. vtk_detect_library_shared(vtklibharu LibHaru::LibHaru)
  142. -set(HPDF_DLL 0)
  143. -if (WIN32 AND vtklibharu_is_shared)
  144. - set(HPDF_DLL 1)
  145. -endif ()
  146. +if(WIN32)
  147. + if(CMAKE_SIZEOF_VOID_P EQUAL 8)
  148. + set(HPDF_DLL 0)
  149. + if (vtklibharu_is_shared)
  150. + set(HPDF_DLL 1)
  151. + endif ()
  152. + else()
  153. + set(HPDF_DLL_CDECL 0)
  154. + if (vtklibharu_is_shared)
  155. + set(HPDF_DLL_CDECL 1)
  156. + endif ()
  157. + endif()
  158. +endif()
  159. configure_file(
  160. "${CMAKE_CURRENT_SOURCE_DIR}/vtk_libharu.h.in"