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

some more build improvements

Browse Source
This commit is contained in:
chertus 2018-07-17 21:42:05 +03:00
parent cbf1c220ae
commit 955293cea7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/find_capnp.cmake
View File

@ -42,7 +42,7 @@ if (ENABLE_CAPNP)
set (CAPNP_LIBRARY capnpc) set (CAPNP_LIBRARY capnpc)
set (USE_CAPNP 1) set (USE_CAPNP 1)
set (CAPNP_BIN_PATH ${ClickHouse_BINARY_DIR}/contrib/capnproto/c++/src/capnp) set (CAPNP_BIN_PATH ${ClickHouse_BINARY_DIR}/contrib/capnproto/c++/src/capnp)
set (CAPNP_BIN_TARGET capnp_tool) set (CAPNP_BIN_TARGETS capnp_tool capnpc_cpp capnpc_capnp)
endif () endif ()
endif () endif ()

2
dbms/src/Proto/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_custom_command (OUTPUT ServerMessage.capnp.c++ ServerMessage.capnp.h add_custom_command (OUTPUT ServerMessage.capnp.c++ ServerMessage.capnp.h
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/ServerMessage.capnp ${CMAKE_CURRENT_BINARY_DIR}/ServerMessage.capnp COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/ServerMessage.capnp ${CMAKE_CURRENT_BINARY_DIR}/ServerMessage.capnp
COMMAND ${CMAKE_COMMAND} -E env PATH=${CAPNP_BIN_PATH} capnp compile -I ${CAPNP_INCLUDE_DIR} -oc++ ServerMessage.capnp COMMAND ${CMAKE_COMMAND} -E env PATH=${CAPNP_BIN_PATH} capnp compile -I ${CAPNP_INCLUDE_DIR} -oc++ ServerMessage.capnp
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ServerMessage.capnp ${CAPNP_BIN_TARGET}) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ServerMessage.capnp ${CAPNP_BIN_TARGETS})
add_library (clickhouse_proto ServerMessage.capnp.c++ protoHelpers.cpp) add_library (clickhouse_proto ServerMessage.capnp.c++ protoHelpers.cpp)
target_link_libraries (clickhouse_proto clickhouse_common_io ${CAPNP_LIBRARY}) target_link_libraries (clickhouse_proto clickhouse_common_io ${CAPNP_LIBRARY})

2
dbms/src/Proto/protoHelpers.h
View File

@ -5,7 +5,7 @@ namespace DB
{ {
class Context; class Context;
class Block; class Block;
class TableMetadata; struct TableMetadata;
Block storeTableMetadata(const TableMetadata & table_meta); Block storeTableMetadata(const TableMetadata & table_meta);
void loadTableMetadata(const Block & block, TableMetadata & table_meta); void loadTableMetadata(const Block & block, TableMetadata & table_meta);