pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

nixpkgs / pkgs / development / libraries / opencv / cmake-don-t-use-OpenCVFindOpenEXR.patch
at 22.05-pre 29 lines 1.0 kB view raw
Thiago Franco de Moraes opencv-4: 4.3.0 -> 4.5.2
cab40572
1diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake 2index 23a6ca6959..27e121943a 100644 3--- a/cmake/OpenCVFindLibsGrfmt.cmake 4+++ b/cmake/OpenCVFindLibsGrfmt.cmake 5@@ -255,21 +255,12 @@ endif() 6 # --- OpenEXR (optional) --- 7 if(WITH_OPENEXR) 8 ocv_clear_vars(HAVE_OPENEXR) 9- if(NOT BUILD_OPENEXR) 10- ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) 11- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") 12- endif() 13+ pkg_check_modules(OPENEXR OpenEXR) 14 15 if(OPENEXR_FOUND) 16 set(HAVE_OPENEXR YES) 17- else() 18- ocv_clear_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) 19- 20- set(OPENEXR_LIBRARIES IlmImf) 21- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr") 22- if(OPENEXR_VERSION) # check via TARGET doesn't work 23- set(HAVE_OPENEXR YES) 24- endif() 25+ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS}) 26+ set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}) 27 endif() 28 endif() 29