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

Misc build fix

Browse Source
This commit is contained in:
Amos Bird 2019-07-17 02:27:11 +08:00
parent f5b7523429
commit a3312106af
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/CMakeLists.txt
View File

@ -236,7 +236,7 @@ target_link_libraries(clickhouse_common_io
) )
if(ZSTD_LIBRARY) if(ZSTD_LIBRARY)
target_link_libraries(clickhouse_common_io PRIVATE ${ZSTD_LIBRARY}) target_link_libraries(clickhouse_common_io PUBLIC ${ZSTD_LIBRARY})
endif() endif()
if (USE_RDKAFKA) if (USE_RDKAFKA)
@ -286,10 +286,6 @@ target_link_libraries (dbms
Threads::Threads Threads::Threads
) )
if(ZSTD_LIBRARY)
target_link_libraries(clickhouse_common_io PRIVATE ${ZSTD_LIBRARY})
endif()
target_include_directories(dbms PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src/Core/include) target_include_directories(dbms PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src/Core/include)
target_include_directories(clickhouse_common_io PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src/Core/include) # uses some includes from core target_include_directories(clickhouse_common_io PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/src/Core/include) # uses some includes from core
target_include_directories(dbms SYSTEM BEFORE PUBLIC ${PDQSORT_INCLUDE_DIR}) target_include_directories(dbms SYSTEM BEFORE PUBLIC ${PDQSORT_INCLUDE_DIR})

2
dbms/src/Columns/Collator.cpp
View File

@ -7,8 +7,8 @@
#else #else
#ifdef __clang__ #ifdef __clang__
#pragma clang diagnostic ignored "-Wunused-private-field" #pragma clang diagnostic ignored "-Wunused-private-field"
#pragma clang diagnostic ignored "-Wmissing-noreturn"
#endif #endif
#pragma clang diagnostic ignored "-Wmissing-noreturn"
#endif #endif
#include <Common/Exception.h> #include <Common/Exception.h>