cmath.patch 4.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121
  1. diff --git a/cmake/FindCMath.cmake b/cmake/FindCMath.cmake
  2. index ad92218..d3dc089 100644
  3. --- a/cmake/FindCMath.cmake
  4. +++ b/cmake/FindCMath.cmake
  5. @@ -55,18 +55,11 @@ if(CMath_FOUND)
  6. set(CMath_INCLUDE_DIRS)
  7. endif()
  8. if(NOT CMath_LIBRARIES)
  9. + if(NOT CMath_LIBRARY)
  10. + unset(CMath_LIBRARY)
  11. + endif()
  12. if (CMath_LIBRARY)
  13. set(CMath_LIBRARIES ${CMath_LIBRARY})
  14. endif()
  15. endif()
  16. -
  17. - if(NOT TARGET CMath::CMath)
  18. - if(CMath_LIBRARIES)
  19. - add_library(CMath::CMath UNKNOWN IMPORTED)
  20. - set_target_properties(CMath::CMath PROPERTIES
  21. - IMPORTED_LOCATION "${CMath_LIBRARY}")
  22. - else()
  23. - add_library(CMath::CMath INTERFACE IMPORTED)
  24. - endif()
  25. - endif()
  26. endif()
  27. diff --git a/contrib/dbs/CMakeLists.txt b/contrib/dbs/CMakeLists.txt
  28. index 74b2a02..2ed96ac 100644
  29. --- a/contrib/dbs/CMakeLists.txt
  30. +++ b/contrib/dbs/CMakeLists.txt
  31. @@ -26,13 +26,19 @@ add_executable(tiff-bi tiff-bi.c)
  32. target_link_libraries(tiff-bi tiff tiff_port)
  33. add_executable(tiff-grayscale tiff-grayscale.c)
  34. -target_link_libraries(tiff-grayscale tiff tiff_port CMath::CMath)
  35. +target_link_libraries(tiff-grayscale tiff tiff_port)
  36. +if(CMath_LIBRARIES)
  37. + target_link_libraries(tiff-grayscale ${CMath_LIBRARIES})
  38. +endif()
  39. add_executable(tiff-palette tiff-palette.c)
  40. target_link_libraries(tiff-palette tiff tiff_port)
  41. add_executable(tiff-rgb tiff-rgb.c)
  42. -target_link_libraries(tiff-rgb tiff tiff_port CMath::CMath)
  43. +target_link_libraries(tiff-rgb tiff tiff_port)
  44. +if(CMath_LIBRARIES)
  45. + target_link_libraries(tiff-rgb ${CMath_LIBRARIES})
  46. +endif()
  47. if(WEBP_SUPPORT AND EMSCRIPTEN)
  48. # Emscripten is pretty finnicky about linker flags.
  49. diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
  50. index a8aa0c3..25914c9 100644
  51. --- a/libtiff/CMakeLists.txt
  52. +++ b/libtiff/CMakeLists.txt
  53. @@ -184,9 +184,9 @@ if(WEBP_SUPPORT)
  54. target_link_libraries(tiff PRIVATE WebP::webp)
  55. string(APPEND tiff_requires_private " libwebp")
  56. endif()
  57. -if(CMath_LIBRARY)
  58. - target_link_libraries(tiff PRIVATE CMath::CMath)
  59. - list(APPEND tiff_libs_private_list "${CMath_LIBRARY}")
  60. +if(CMath_LIBRARIES)
  61. + target_link_libraries(tiff PRIVATE ${CMath_LIBRARIES})
  62. + list(APPEND tiff_libs_private_list "${CMath_LIBRARIES}")
  63. endif()
  64. set(tiff_libs_private_list "${tiff_libs_private_list}" PARENT_SCOPE)
  65. diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
  66. index 5bf93b1..f6c4e2f 100644
  67. --- a/tools/CMakeLists.txt
  68. +++ b/tools/CMakeLists.txt
  69. @@ -48,7 +48,10 @@ target_link_libraries(ppm2tiff PRIVATE tiff tiff_port)
  70. add_executable(raw2tiff ../placeholder.h)
  71. target_sources(raw2tiff PRIVATE raw2tiff.c ${MSVC_RESOURCE_FILE})
  72. -target_link_libraries(raw2tiff PRIVATE tiff tiff_port CMath::CMath)
  73. +target_link_libraries(raw2tiff PRIVATE tiff tiff_port)
  74. +if(CMath_LIBRARIES)
  75. + target_link_libraries(raw2tiff PRIVATE ${CMath_LIBRARIES})
  76. +endif()
  77. add_executable(rgb2ycbcr ../placeholder.h)
  78. target_sources(rgb2ycbcr PRIVATE rgb2ycbcr.c ${MSVC_RESOURCE_FILE})
  79. @@ -56,7 +59,10 @@ target_link_libraries(rgb2ycbcr PRIVATE tiff tiff_port)
  80. add_executable(thumbnail ../placeholder.h)
  81. target_sources(thumbnail PRIVATE thumbnail.c ${MSVC_RESOURCE_FILE})
  82. -target_link_libraries(thumbnail PRIVATE tiff tiff_port CMath::CMath)
  83. +target_link_libraries(thumbnail PRIVATE tiff tiff_port)
  84. +if(CMath_LIBRARIES)
  85. + target_link_libraries(thumbnail PRIVATE ${CMath_LIBRARIES})
  86. +endif()
  87. add_executable(tiff2bw ../placeholder.h)
  88. target_sources(tiff2bw PRIVATE tiff2bw.c ${MSVC_RESOURCE_FILE})
  89. @@ -68,7 +74,10 @@ target_link_libraries(tiff2pdf PRIVATE tiff tiff_port)
  90. add_executable(tiff2ps ../placeholder.h)
  91. target_sources(tiff2ps PRIVATE tiff2ps.c ${MSVC_RESOURCE_FILE})
  92. -target_link_libraries(tiff2ps PRIVATE tiff tiff_port CMath::CMath)
  93. +target_link_libraries(tiff2ps PRIVATE tiff tiff_port)
  94. +if(CMath_LIBRARIES)
  95. + target_link_libraries(tiff2ps PRIVATE ${CMath_LIBRARIES})
  96. +endif()
  97. add_executable(tiff2rgba ../placeholder.h)
  98. target_sources(tiff2rgba PRIVATE tiff2rgba.c ${MSVC_RESOURCE_FILE})
  99. @@ -84,7 +93,10 @@ target_link_libraries(tiffcp PRIVATE tiff tiff_port)
  100. add_executable(tiffcrop ../placeholder.h)
  101. target_sources(tiffcrop PRIVATE tiffcrop.c ${MSVC_RESOURCE_FILE})
  102. -target_link_libraries(tiffcrop PRIVATE tiff tiff_port CMath::CMath)
  103. +target_link_libraries(tiffcrop PRIVATE tiff tiff_port)
  104. +if(CMath_LIBRARIES)
  105. + target_link_libraries(tiffcrop PRIVATE ${CMath_LIBRARIES})
  106. +endif()
  107. add_executable(tiffdither ../placeholder.h)
  108. target_sources(tiffdither PRIVATE tiffdither.c ${MSVC_RESOURCE_FILE})