ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/opencv3/0003-force-package-requirements.patch

   1 diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
   2 index f99bb33..5407f70 100644
   3 --- a/cmake/OpenCVFindLibsGrfmt.cmake
   4 +++ b/cmake/OpenCVFindLibsGrfmt.cmake
   5 @@ -7,7 +7,7 @@ if(BUILD_ZLIB)
   6    ocv_clear_vars(ZLIB_FOUND)
   7  else()
   8    ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
   9 -  find_package(ZLIB "${MIN_VER_ZLIB}")
  10 +  find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
  11    if(ZLIB_FOUND AND ANDROID)
  12      if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$")
  13        set(ZLIB_LIBRARIES z)
  14 @@ -33,7 +33,7 @@ if(WITH_JPEG)
  15      ocv_clear_vars(JPEG_FOUND)
  16    else()
  17      ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR)
  18 -    include(FindJPEG)
  19 +    find_package(JPEG REQUIRED)
  20    endif()
  21
  22    if(NOT JPEG_FOUND)
  23 @@ -79,7 +79,7 @@ if(WITH_TIFF)
  24      ocv_clear_vars(TIFF_FOUND)
  25    else()
  26      ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR)
  27 -    include(FindTIFF)
  28 +    find_package(TIFF REQUIRED)
  29      if(TIFF_FOUND)
  30        ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION)
  31      endif()
  32 @@ -123,7 +123,7 @@ if(WITH_WEBP)
  33      ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR)
  34    else()
  35      ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR)
  36 -    include(cmake/OpenCVFindWebP.cmake)
  37 +    find_package(WebP REQUIRED)
  38      if(WEBP_FOUND)
  39        set(HAVE_WEBP 1)
  40      endif()
  41 @@ -164,7 +164,7 @@ if(WITH_JASPER)
  42    if(BUILD_JASPER)
  43      ocv_clear_vars(JASPER_FOUND)
  44    else()
  45 -    include(FindJasper)
  46 +    find_package(Jasper REQUIRED)
  47    endif()
  48
  49    if(NOT JASPER_FOUND)
  50 @@ -189,7 +189,7 @@ if(WITH_PNG)
  51      ocv_clear_vars(PNG_FOUND)
  52    else()
  53      ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR)
  54 -    include(FindPNG)
  55 +    find_package(PNG REQUIRED)
  56      if(PNG_FOUND)
  57        include(CheckIncludeFile)
  58        check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
  59 @@ -221,7 +221,7 @@ if(WITH_OPENEXR)
  60    ocv_clear_vars(HAVE_OPENEXR)
  61    if(NOT BUILD_OPENEXR)
  62      ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
  63 -    include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
  64 +    find_package(OpenEXR REQUIRED)
  65    endif()
  66
  67    if(OPENEXR_FOUND)
  68 @@ -239,7 +239,7 @@ endif()
  69
  70  # --- GDAL (optional) ---
  71  if(WITH_GDAL)
  72 -    find_package(GDAL QUIET)
  73 +    find_package(GDAL REQUIRED)
  74
  75      if(NOT GDAL_FOUND)
  76          set(HAVE_GDAL NO)
  77 @@ -251,7 +251,7 @@ if(WITH_GDAL)
  78  endif()
  79
  80  if(WITH_GDCM)
  81 -  find_package(GDCM QUIET)
  82 +  find_package(GDCM REQUIRED)
  83    if(NOT GDCM_FOUND)
  84      set(HAVE_GDCM NO)
  85      ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)