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

Build fixes (#2864)

Browse Source 
* Try fix internal compiler headers path

* Build fixes

* fix

* wip

* clean

* Update arch.cmake
This commit is contained in:
proller 2018-08-14 16:31:27 +03:00 committed by alexey-milovidov
parent a29439cfee
commit a2343890dd
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/arch.cmake
View File

@ -24,3 +24,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set (COMPILER_CLANG 1)
endif ()
if (OS_LINUX AND CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
set (OS_LINUX_X86_64 1)
endif ()

2
cmake/find_rdkafka.cmake
View File

@ -2,7 +2,9 @@ option (ENABLE_RDKAFKA "Enable kafka" ON)
if (ENABLE_RDKAFKA)
if (OS_LINUX_X86_64)
option (USE_INTERNAL_RDKAFKA_LIBRARY "Set to FALSE to use system librdkafka instead of the bundled" ${NOT_UNBUNDLED})
endif ()
if (USE_INTERNAL_RDKAFKA_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/librdkafka/CMakeLists.txt")
message (WARNING "submodule contrib/librdkafka is missing. to fix try run: \n git submodule update --init --recursive")

2
cmake/find_zlib.cmake
View File

@ -1,4 +1,6 @@
if (NOT OS_FREEBSD)
option (USE_INTERNAL_ZLIB_LIBRARY "Set to FALSE to use system zlib library instead of bundled" ${NOT_UNBUNDLED})
endif ()
if (NOT USE_INTERNAL_ZLIB_LIBRARY)
find_package (ZLIB)

2
dbms/programs/CMakeLists.txt
View File

@ -30,7 +30,7 @@ add_subdirectory (obfuscator)
if (CLICKHOUSE_SPLIT_BINARY)
set (CLICKHOUSE_ALL_TARGETS clickhouse-server clickhouse-client clickhouse-local clickhouse-benchmark clickhouse-performance-test
clickhouse-extract-from-config clickhouse-format clickhouse-copier)
clickhouse-extract-from-config clickhouse-compressor clickhouse-format clickhouse-copier)
if (USE_EMBEDDED_COMPILER)
list (APPEND CLICKHOUSE_ALL_TARGETS clickhouse-clang clickhouse-lld)

2
libs/libmysqlxx/cmake/find_mysqlclient.cmake
View File

@ -1,5 +1,5 @@
option (ENABLE_MYSQL "Enable MySQL" ${OS_LINUX})
if (OS_LINUX)
if (OS_LINUX_X86_64)
option (USE_INTERNAL_MYSQL_LIBRARY "Set to FALSE to use system mysqlclient library instead of bundled" ${NOT_UNBUNDLED})
else ()
option (USE_INTERNAL_MYSQL_LIBRARY "Set to FALSE to use system mysqlclient library instead of bundled" OFF)