pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch

   1 From 6d988c08e852379a163ecd20df8639196d84d014 Mon Sep 17 00:00:00 2001
   2 From: Bernardo Meurer <meurerbernardo@gmail.com>
   3 Date: Sun, 26 Apr 2020 14:50:25 -0700
   4 Subject: [PATCH] cmake: don't use OpenCVFindOpenEXR
   5
   6 Use find_package for this.
   7 ---
   8  CMakeLists.txt                  |  2 ++
   9  cmake/OpenCVFindLibsGrfmt.cmake | 15 +++------------
  10  2 files changed, 5 insertions(+), 12 deletions(-)
  11
  12 diff --git a/CMakeLists.txt b/CMakeLists.txt
  13 index 4c0b3880fc..0360469350 100644
  14 --- a/CMakeLists.txt
  15 +++ b/CMakeLists.txt
  16 @@ -14,6 +14,8 @@ FATAL: In-source builds are not allowed.
  17  ")
  18  endif()
  19
  20 +# the future!
  21 +include(FindPkgConfig)
  22
  23  include(cmake/OpenCVMinDepVersions.cmake)
  24
  25 diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
  26 index 0beaf19317..4c5e46e615 100644
  27 --- a/cmake/OpenCVFindLibsGrfmt.cmake
  28 +++ b/cmake/OpenCVFindLibsGrfmt.cmake
  29 @@ -227,20 +227,11 @@ endif()
  30  # --- OpenEXR (optional) ---
  31  if(WITH_OPENEXR)
  32    ocv_clear_vars(HAVE_OPENEXR)
  33 -  if(NOT BUILD_OPENEXR)
  34 -    include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
  35 -  endif()
  36 -
  37 +  pkg_check_modules(OPENEXR OpenEXR)
  38    if(OPENEXR_FOUND)
  39      set(HAVE_OPENEXR YES)
  40 -  else()
  41 -    ocv_clear_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
  42 -
  43 -    set(OPENEXR_LIBRARIES IlmImf)
  44 -    add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr")
  45 -    if(OPENEXR_VERSION)  # check via TARGET doesn't work
  46 -      set(HAVE_OPENEXR YES)
  47 -    endif()
  48 +    set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS})
  49 +    set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES})
  50    endif()
  51  endif()
  52
  53 --
  54 2.26.1
  55