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

fix USE_INTERNAL_ZLIB_LIBRARY=0 with poco (#608)

Browse Source 
* Try fix double version up during release

* fix moveing cmake files

* fix USE_INTERNAL_ZLIB_LIBRARY=0 with poco
This commit is contained in:
proller 2017-03-17 16:04:17 +03:00 committed by GitHub
parent 72f4236656
commit 9cf97911db
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -161,6 +161,7 @@ message (STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE
include (cmake/find_openssl.cmake)
include (cmake/find_icu4c.cmake)
include (cmake/find_boost.cmake)
# zlib before poco
include (cmake/find_zlib.cmake)
include (cmake/find_zstd.cmake)
include (cmake/find_poco.cmake)

2
cmake/find_poco.cmake
View File

@ -20,7 +20,7 @@ else ()
"${ClickHouse_SOURCE_DIR}/contrib/libpoco/MongoDB/include/"
)
if (USE_STATIC_LIBRARIES)
if (USE_STATIC_LIBRARIES AND USE_INTERNAL_ZLIB_LIBRARY)
set (Poco_INCLUDE_DIRS ${Poco_INCLUDE_DIRS} "${ClickHouse_SOURCE_DIR}/contrib/libzlib-ng/" "${ClickHouse_BINARY_DIR}/contrib/libzlib-ng/")
endif ()