File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -13,11 +13,6 @@ if(HAVE_WINRT_CX AND NOT WINRT)
13
13
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW" )
14
14
endif ()
15
15
16
- if (HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR )
17
- ocv_include_directories (${ZLIB_INCLUDE_DIRS} )
18
- list (APPEND GRFMT_LIBS ${ZLIB_LIBRARIES} )
19
- endif ()
20
-
21
16
if (HAVE_JPEG )
22
17
ocv_include_directories (${JPEG_INCLUDE_DIR} ${${JPEG_LIBRARY}_BINARY_DIR} )
23
18
list (APPEND GRFMT_LIBS ${JPEG_LIBRARIES} )
@@ -58,6 +53,11 @@ if(HAVE_OPENEXR)
58
53
list (APPEND GRFMT_LIBS ${OPENEXR_LIBRARIES} )
59
54
endif ()
60
55
56
+ if (HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR )
57
+ ocv_include_directories (${ZLIB_INCLUDE_DIRS} )
58
+ list (APPEND GRFMT_LIBS ${ZLIB_LIBRARIES} )
59
+ endif ()
60
+
61
61
if (HAVE_GDAL )
62
62
include_directories (SYSTEM ${GDAL_INCLUDE_DIR} )
63
63
list (APPEND GRFMT_LIBS ${GDAL_LIBRARY} )
You can’t perform that action at this time.
0 commit comments