From c1e8b674e042a27448d6e941a062b9c801321ab1 Mon Sep 17 00:00:00 2001 From: Alexey Zatelepin Date: Mon, 9 Jan 2017 16:07:42 +0300 Subject: [PATCH] add missing zlib include dir [#METR-23582] --- CMakeLists.txt | 1 + contrib/libpoco/Foundation/CMakeLists.txt | 1 - contrib/libzlib-ng/CMakeLists.txt | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 538e312a767..1332eed5493 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,6 +169,7 @@ include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libboost/boost_1_62 if (USE_STATIC_LIBRARIES) include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libzlib-ng/) + include_directories (BEFORE ${ClickHouse_BINARY_DIR}/contrib/libzlib-ng/) endif () include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/libs/libcommon/include/) diff --git a/contrib/libpoco/Foundation/CMakeLists.txt b/contrib/libpoco/Foundation/CMakeLists.txt index 9eb811360c3..3c59aafcc8b 100644 --- a/contrib/libpoco/Foundation/CMakeLists.txt +++ b/contrib/libpoco/Foundation/CMakeLists.txt @@ -74,7 +74,6 @@ endif (POCO_UNBUNDLED) if (USE_STATIC_LIBRARIES) # Use zlib from clickhouse contrib. set(SYSLIBS ${SYSLIBS} zlibstatic) - include_directories("${ClickHouse_SOURCE_DIR}/contrib/libzlib-ng/") else() find_package(ZLIB REQUIRED) set(SYSLIBS ${SYSLIBS} ${ZLIB_LIBRARIES}) diff --git a/contrib/libzlib-ng/CMakeLists.txt b/contrib/libzlib-ng/CMakeLists.txt index 6c443322923..90c71d8dd52 100644 --- a/contrib/libzlib-ng/CMakeLists.txt +++ b/contrib/libzlib-ng/CMakeLists.txt @@ -551,5 +551,3 @@ if(HAVE_OFF64_T) target_link_libraries(minigzip64 zlib) set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") endif() - -FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES)