thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

add missing zlib include dir [#METR-23582]

Browse Source
This commit is contained in:
Alexey Zatelepin 2017-01-09 16:07:42 +03:00
parent d0961238b9
commit c1e8b674e0
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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/)

1
contrib/libpoco/Foundation/CMakeLists.txt
View File

@ -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})

2
contrib/libzlib-ng/CMakeLists.txt
View File

@ -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)