Skip to content

Commit a49e5c2

Browse files
committed
libmatroska2: use the library/include found for zlib
Fixes #156
1 parent 9ef20b7 commit a49e5c2

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

libmatroska2/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ target_include_directories("matroska2" PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_
5252

5353
if (CONFIG_ZLIB)
5454
if(ZLIB_FOUND)
55-
target_link_libraries("matroska2" PRIVATE $<BUILD_INTERFACE:z>)
55+
target_include_directories("matroska2" PRIVATE ${ZLIB_INCLUDE_DIRS})
56+
target_link_libraries("matroska2" PRIVATE ${ZLIB_LIBRARIES})
5657
else()
5758
target_link_libraries("matroska2" PRIVATE $<BUILD_INTERFACE:zlib>)
5859
endif()

libmatroska2/matroskamain.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@
2828
#include "matroska2/matroska.h"
2929
#include "matroska2/matroska_sem.h"
3030
#include "matroska2/matroska_classes.h"
31-
#if defined(HAVE_ZLIB)
32-
#include "zlib/zlib.h"
33-
#elif defined(CONFIG_ZLIB)
34-
#include "zlib.h"
31+
#if defined(CONFIG_ZLIB)
32+
#include <zlib.h>
3533
#endif
3634
#if defined(CONFIG_BZLIB)
3735
#include <bzlib.h>

0 commit comments

Comments
 (0)