Skip to content

Commit cc26158

Browse files
authored
Move from zlib to zlib-ng optimized fork (#3570)
- as zlib is linked statically this PR adds libz.a to list of excluded libs to avoid symbol overlap with system zlib Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
1 parent a3965c7 commit cc26158

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

DALI_DEPS_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
051d575ee0989ef8448188387a7f596e8ed90515
1+
68359b04f7683e7e5f247ec6cb75c11f2d7e1fcd

cmake/Dependencies.common.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if (BUILD_OPENCV)
2727
include_directories(SYSTEM ${OpenCV_INCLUDE_DIRS})
2828
list(APPEND DALI_LIBS ${OpenCV_LIBRARIES})
2929
message("OpenCV libraries: ${OpenCV_LIBRARIES}")
30-
list(APPEND DALI_EXCLUDES libopencv_core.a;libopencv_imgproc.a;libopencv_highgui.a;libopencv_imgcodecs.a;liblibwebp.a;libittnotify.a;libpng.a;liblibtiff.a;liblibjasper.a;libIlmImf.a;liblibjpeg-turbo.a)
30+
list(APPEND DALI_EXCLUDES libopencv_core.a;libopencv_imgproc.a;libopencv_highgui.a;libopencv_imgcodecs.a;liblibwebp.a;libittnotify.a;libpng.a;liblibtiff.a;liblibjasper.a;libIlmImf.a;liblibjpeg-turbo.a;libz.a)
3131
endif()
3232

3333
##################################################################

0 commit comments

Comments
 (0)