potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-06-10 19:03:53 +00:00
parent 987061d800 878af7ada8
commit 11b020b9f9
327 changed files with 46020 additions and 13065 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVFindLibsGrfmt.cmake
+8 -7
View File
@@ -211,21 +211,22 @@ endif()
# --- OpenEXR (optional) ---
if(WITH_OPENEXR)
if(BUILD_OPENEXR)
ocv_clear_vars(OPENEXR_FOUND)
else()
ocv_clear_vars(HAVE_OPENEXR)
if(NOT BUILD_OPENEXR)
include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
endif()
if(NOT OPENEXR_FOUND)
if(OPENEXR_FOUND)
set(HAVE_OPENEXR YES)
else()
ocv_clear_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION)
set(OPENEXR_LIBRARIES IlmImf)
set(OPENEXR_ILMIMF_LIBRARY IlmImf)
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr")
if(OPENEXR_VERSION) # check via TARGET doesn't work
set(HAVE_OPENEXR YES)
endif()
endif()
set(HAVE_OPENEXR YES)
endif()
# --- GDAL (optional) ---