From b190626a474e6123937f11f5e4a28e976d41f319 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sun, 3 Feb 2019 02:20:29 +0100 Subject: [PATCH] CMake / Linux: make sure system zlib and bz2 headers are used --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b6a8fa..4d283a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,6 +252,7 @@ set(TOMMATH_FILES src/libtommath/bn_s_mp_sub.c ) +# Needed for Windows set(ZLIB_BZIP2_FILES src/bzip2/blocksort.c src/bzip2/bzlib.c @@ -283,8 +284,12 @@ if(WIN32) else() find_package(ZLIB REQUIRED) find_package(BZip2 REQUIRED) + include_directories(${ZLIB_INCLUDE_DIR} ${BZIP2_INCLUDE_DIR}) set(LINK_LIBS ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES}) + + add_definitions(-D__SYS_ZLIB -D__SYS_BZLIB) + option(WITH_LIBTOMCRYPT "Use system LibTomCrypt library" OFF) if(WITH_LIBTOMCRYPT) set(LINK_LIBS ${LINK_LIBS} tomcrypt)