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

Fix brotli build

Browse Source
This commit is contained in:
alesapin 2019-02-02 17:17:51 +03:00
parent 1a3cef8216
commit 708e06837a
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/find_brotli.cmake
View File

@ -9,15 +9,16 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/brotli/c/include/brotli/decode.
endif ()
if (NOT USE_INTERNAL_BROTLI_LIBRARY)
find_library (BROTLI_LIBRARY libbrotli)
find_library (BROTLI_LIBRARY brotli)
find_path (BROTLI_INCLUDE_DIR NAMES decode.h encode.h port.h types.h PATHS ${BROTLI_INCLUDE_PATHS})
endif ()
if (BROTLI_LIBRARY AND BROTLI_INCLUDE_DIR)
elseif (NOT MISSING_INTERNAL_BROTLI_LIBRARY)
set (BROTLI_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/libbrotli/c/include)
set (BROTLI_INCLUDE_DIR ${ClickHouse_SOURCE_DIR}/contrib/brotli/c/include)
set (USE_INTERNAL_BROTLI_LIBRARY 1)
set (BROTLI_LIBRARY libbrotli)
set (BROTLI_LIBRARY brotli)
set (USE_BROTLI 1)
endif ()
message (STATUS "Using brotli: ${BROTLI_INCLUDE_DIR} : ${BROTLI_LIBRARY}")

4
contrib/CMakeLists.txt vendored
View File

@ -215,8 +215,8 @@ if (USE_INTERNAL_LIBXML2_LIBRARY)
add_subdirectory(libxml2-cmake)
endif ()
if (USE_INTERNAL_LIBBROTLI_LIBRARY)
add_subdirectory(libbrotli-cmake)
if (USE_INTERNAL_BROTLI_LIBRARY)
add_subdirectory(brotli-cmake)
endif ()
if (USE_INTERNAL_PROTOBUF_LIBRARY)

9
contrib/brotli-cmake/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set(BROTLI_SOURCE_DIR ${CMAKE_SOURCE_DIR}/contrib/brotli)
set(BROTLI_BINARY_DIR ${CMAKE_BINARY_DIR}/contrib/brotli)
set(BROTLI_SOURCE_DIR ${CMAKE_SOURCE_DIR}/contrib/brotli/c)
set(BROTLI_BINARY_DIR ${CMAKE_BINARY_DIR}/contrib/brotli/c)
set(SRCS
${BROTLI_SOURCE_DIR}/dec/bit_reader.c
@ -27,6 +27,7 @@ set(SRCS
${BROTLI_SOURCE_DIR}/common/dictionary.c
${BROTLI_SOURCE_DIR}/common/transform.c
)
add_library(libbrotli STATIC ${SRCS})
target_include_directories(libbrotli PUBLIC ${BROTLI_SOURCE_DIR}/c/include)
add_library(brotli STATIC ${SRCS})
target_include_directories(brotli PUBLIC ${BROTLI_SOURCE_DIR}/include)