|
|
|
@ -13,11 +13,6 @@ if(HAVE_WINRT_CX AND NOT WINRT) |
|
|
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR) |
|
|
|
|
ocv_include_directories(${ZLIB_INCLUDE_DIRS}) |
|
|
|
|
list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES}) |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
if(HAVE_JPEG) |
|
|
|
|
ocv_include_directories(${JPEG_INCLUDE_DIR} ${${JPEG_LIBRARY}_BINARY_DIR}) |
|
|
|
|
list(APPEND GRFMT_LIBS ${JPEG_LIBRARIES}) |
|
|
|
@ -58,6 +53,11 @@ if(HAVE_OPENEXR) |
|
|
|
|
list(APPEND GRFMT_LIBS ${OPENEXR_LIBRARIES}) |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR) |
|
|
|
|
ocv_include_directories(${ZLIB_INCLUDE_DIRS}) |
|
|
|
|
list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES}) |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
if(HAVE_GDAL) |
|
|
|
|
include_directories(SYSTEM ${GDAL_INCLUDE_DIR}) |
|
|
|
|
list(APPEND GRFMT_LIBS ${GDAL_LIBRARY}) |
|
|
|
|