CMakeLists.txt | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit bc5edcfba6ae88e989892f5d24c69d8ed719ab78
Author: Albert Astals Cid <aa...@kde.org>
Date: Sun Aug 2 20:19:19 2020 +0200
cmake: Modern way to link against zlib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bfab2cf..68c00149 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,10 +272,6 @@ include_directories(
${FREETYPE_INCLUDE_DIRS}
)
-if(ENABLE_ZLIB)
- include_directories(SYSTEM ${ZLIB_INCLUDE_DIR})
-endif()
-
if (NSS3_FOUND)
set(ENABLE_NSS3 ON)
endif()
@@ -455,7 +451,7 @@ if(ENABLE_ZLIB)
set(poppler_SRCS ${poppler_SRCS}
poppler/FlateEncoder.cc
)
- set(poppler_LIBS ${poppler_LIBS} ${ZLIB_LIBRARIES})
+ set(poppler_LIBS ${poppler_LIBS} ZLIB::ZLIB)
endif()
if(ENABLE_ZLIB_UNCOMPRESS)
set(poppler_SRCS ${poppler_SRCS}
_______________________________________________
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
