thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10168 from azat/unbundled-msgpack

Browse Source 
Add ability to use unbundled msgpack
This commit is contained in:
alexey-milovidov 2020-04-11 23:20:44 +03:00 committed by GitHub
commit 98c603eaae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/find/msgpack.cmake
View File

@ -1,2 +1,17 @@
set(MSGPACK_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/msgpack-c/include)
option (USE_INTERNAL_MSGPACK_LIBRARY "Set to FALSE to use system msgpack library instead of bundled" ${NOT_UNBUNDLED})
if (USE_INTERNAL_MSGPACK_LIBRARY)
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/msgpack-c/include/msgpack.hpp")
message(WARNING "Submodule contrib/msgpack-c is missing. To fix try run: \n git submodule update --init --recursive")
set(USE_INTERNAL_MSGPACK_LIBRARY 0)
set(MISSING_INTERNAL_MSGPACK_LIBRARY 1)
endif()
endif()
if (USE_INTERNAL_MSGPACK_LIBRARY)
set(MSGPACK_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/msgpack-c/include)
else()
find_path(MSGPACK_INCLUDE_DIR NAMES msgpack.hpp PATHS ${MSGPACK_INCLUDE_PATHS})
endif()
message(STATUS "Using msgpack: ${MSGPACK_INCLUDE_DIR}")

1
docker/packager/deb/Dockerfile
View File

@ -48,6 +48,7 @@ RUN apt-get --allow-unauthenticated update -y \
libltdl-dev \
libre2-dev \
libjemalloc-dev \
libmsgpack-dev \
unixodbc-dev \
odbcinst \
tzdata \