Repository: incubator-quickstep Updated Branches: refs/heads/partitioned-select e40e65129 -> 929e5f1dd (forced update)
Fixed the linking issue for the distributed cli. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/7727e773 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/7727e773 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/7727e773 Branch: refs/heads/partitioned-select Commit: 7727e7735630a064c1feff9985143463b61002d6 Parents: 6ec9e9d Author: Zuyu Zhang <zu...@apache.org> Authored: Thu Feb 2 19:13:09 2017 -0800 Committer: Zuyu Zhang <zu...@apache.org> Committed: Thu Feb 2 19:13:09 2017 -0800 ---------------------------------------------------------------------- CMakeLists.txt | 23 +++++++++++++++++++---- cli/distributed/CMakeLists.txt | 20 -------------------- 2 files changed, 19 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7727e773/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index ccb23a3..85210ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -808,17 +808,32 @@ target_link_libraries(quickstep_cli_shell ${LIBS}) if (ENABLE_DISTRIBUTED) # Build the quickstep_distributed_cli_shell executable. - add_executable (quickstep_distributed_cli_shell cli/distributed/QuickstepDistributedCli.cpp) + add_executable (quickstep_distributed_cli_shell + cli/distributed/Cli.hpp + cli/distributed/Cli.cpp + cli/distributed/QuickstepDistributedCli.cpp) # Link against direct deps (will transitively pull in everything needed). - # NOTE(zuyu): Link quickstep_cli_LineReader on behalf of quickstep_cli_distributed_Cli, - # as a workaround for bypassing conditionally built target checks in validate_cmakelists.py. target_link_libraries(quickstep_distributed_cli_shell glog + quickstep_catalog_CatalogRelation + quickstep_cli_Flags quickstep_cli_LineReader - quickstep_cli_distributed_Cli + quickstep_cli_PrintToScreen quickstep_cli_distributed_Conductor quickstep_cli_distributed_Executor + quickstep_cli_distributed_Role + quickstep_parser_ParseStatement + quickstep_parser_SqlParserWrapper + quickstep_queryexecution_BlockLocatorUtil + quickstep_queryexecution_QueryExecutionMessages_proto + quickstep_queryexecution_QueryExecutionTypedefs + quickstep_queryexecution_QueryExecutionUtil + quickstep_storage_DataExchangerAsync + quickstep_storage_StorageBlockInfo + quickstep_storage_StorageManager + quickstep_utility_Macros quickstep_utility_StringUtil + tmb ${GFLAGS_LIB_NAME} ${GRPCPLUSPLUS_LIBRARIES}) endif(ENABLE_DISTRIBUTED) http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7727e773/cli/distributed/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cli/distributed/CMakeLists.txt b/cli/distributed/CMakeLists.txt index a00ffda..b46082f 100644 --- a/cli/distributed/CMakeLists.txt +++ b/cli/distributed/CMakeLists.txt @@ -18,30 +18,11 @@ set_gflags_lib_name () # Declare micro-libs and link dependencies: -add_library(quickstep_cli_distributed_Cli Cli.cpp Cli.hpp) add_library(quickstep_cli_distributed_Conductor Conductor.cpp Conductor.hpp) add_library(quickstep_cli_distributed_Executor Executor.cpp Executor.hpp) add_library(quickstep_cli_distributed_Role Role.cpp Role.hpp) # Link dependencies: -target_link_libraries(quickstep_cli_distributed_Cli - glog - quickstep_catalog_CatalogRelation - quickstep_cli_Flags - quickstep_cli_PrintToScreen - quickstep_cli_distributed_Role - quickstep_parser_ParseStatement - quickstep_parser_SqlParserWrapper - quickstep_queryexecution_BlockLocatorUtil - quickstep_queryexecution_QueryExecutionMessages_proto - quickstep_queryexecution_QueryExecutionTypedefs - quickstep_queryexecution_QueryExecutionUtil - quickstep_storage_DataExchangerAsync - quickstep_storage_StorageBlockInfo - quickstep_storage_StorageManager - quickstep_utility_Macros - quickstep_utility_StringUtil - tmb) target_link_libraries(quickstep_cli_distributed_Conductor glog quickstep_cli_DefaultsConfigurator @@ -83,7 +64,6 @@ target_link_libraries(quickstep_cli_distributed_Role add_library(quickstep_cli_distributed ../../empty_src.cpp CliDistributedModule.hpp) target_link_libraries(quickstep_cli_distributed - quickstep_cli_distributed_Cli quickstep_cli_distributed_Conductor quickstep_cli_distributed_Executor quickstep_cli_distributed_Role)
