Skip to content

Commit

Permalink
build: fix link issues if local libs conflict with third-party libs (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
zhanghaohit authored Mar 7, 2022
1 parent 725c25c commit e71190c
Show file tree
Hide file tree
Showing 12 changed files with 70 additions and 47 deletions.
15 changes: 13 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,20 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
if (MAC_TABLET_ENABLE)
add_compile_definitions(__mac_tablet__=1)
endif ()

find_package(OpenSSL REQUIRED)
find_library(BRPC_LIBRARY brpc)
find_library(PROTOBUF_LIBRARY protobuf)
find_library(GLOG_LIBRARY glog)
find_library(GFLAGS_LIBRARY gflags)
find_library(UNWIND_LIBRARY unwind)
find_library(LEVELDB_LIBRARY leveldb)
find_library(Z_LIBRARY z)
find_library(SNAPPY_LIBRARY snappy)

if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(OS_LIB ${CMAKE_THREAD_LIBS_INIT} rt)
set(BRPC_LIBS brpc protobuf glog gflags unwind ssl crypto leveldb z snappy dl pthread ${OS_LIB})
set(BRPC_LIBS ${BRPC_LIBRARY} ${PROTOBUF_LIBRARY} ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${UNWIND_LIBRARY} ${OPENSSL_LIBRARIES} ${LEVELDB_LIBRARY} ${Z_LIBRARY} ${SNAPPY_LIBRARY} dl pthread ${OS_LIB})
elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(OS_LIB
${CMAKE_THREAD_LIBS_INIT}
Expand All @@ -101,7 +112,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
"-Wl,-U,_MallocExtension_ReleaseFreeMemory"
"-Wl,-U,_ProfilerStart"
"-Wl,-U,_ProfilerStop")
set(BRPC_LIBS brpc protobuf glog gflags ssl crypto leveldb z snappy dl pthread ${OS_LIB})
set(BRPC_LIBS ${BRPC_LIBRARY} ${PROTOBUF_LIBRARY} ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${OPENSSL_LIBRARIES} ${LEVELDB_LIBRARY} ${Z_LIBRARY} ${SNAPPY_LIBRARY} dl pthread ${OS_LIB})
endif ()

if (SANITIZER_ENABLE)
Expand Down
20 changes: 16 additions & 4 deletions hybridse/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,22 @@ find_package(Threads)
set(Boost_NO_BOOST_CMAKE ON)
set(BOOST_ROOT "${CMAKE_PREFIX_PATH}")
find_package(Boost COMPONENTS filesystem date_time regex REQUIRED)
find_package(OpenSSL REQUIRED)
find_library(BRPC_LIBRARY brpc)
find_library(PROTOBUF_LIBRARY protobuf)
find_library(GLOG_LIBRARY glog)
find_library(GFLAGS_LIBRARY gflags)
find_library(UNWIND_LIBRARY unwind)
find_library(LEVELDB_LIBRARY leveldb)
find_library(Z_LIBRARY z)
find_library(SNAPPY_LIBRARY snappy)

message(STATUS "Boost libraries ${Boost_LIBRARIES}")
message(STATUS "OpenSSL libraries ${OPENSSL_LIBRARIES}")
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(OS_LIB ${CMAKE_THREAD_LIBS_INIT} rt)
set(COMMON_LIBS ${Boost_LIBRARIES} leveldb protobuf glog unwind z snappy ssl crypto dl)
set(BRPC_LIBS brpc ${COMMON_LIBS})
set(COMMON_LIBS ${Boost_LIBRARIES} ${LEVELDB_LIBRARY} ${PROTOBUF_LIBRARY} ${GLOG_LIBRARY} ${UNWIND_LIBRARY} ${Z_LIBRARY} ${SNAPPY_LIBRARY} ${OPENSSL_LIBRARIES} dl)
set(BRPC_LIBS ${BRPC_LIBRARY} ${COMMON_LIBS})
elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(OS_LIB
${CMAKE_THREAD_LIBS_INIT}
Expand All @@ -102,8 +114,8 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
"-Wl,-U,_MallocExtension_ReleaseFreeMemory"
"-Wl,-U,_ProfilerStart"
"-Wl,-U,_ProfilerStop")
set(COMMON_LIBS ${Boost_LIBRARIES} leveldb protobuf glog z snappy ssl crypto dl)
set(BRPC_LIBS brpc ${COMMON_LIBS})
set(COMMON_LIBS ${Boost_LIBRARIES} ${LEVELDB_LIBRARY} ${PROTOBUF_LIBRARY} ${GLOG_LIBRARY} ${Z_LIBRARY} ${SNAPPY_LIBRARY} ${OPENSSL_LIBRARIES} dl)
set(BRPC_LIBS ${BRPC_LIBRARY} ${COMMON_LIBS})
endif ()

configure_file(
Expand Down
4 changes: 2 additions & 2 deletions hybridse/examples/toydb/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if (TESTING_ENABLE AND EXAMPLES_TESTING_ENABLE)
--gtest_output=xml:${CMAKE_BINARY_DIR}/${TEST_TARGET_NAME}.xml)
target_link_libraries(${TEST_TARGET_NAME}
toydb_lib toydb_sdk hybridse_flags sqlite3
gtest benchmark ${yaml_libs} ${BRPC_LIBS} ${OS_LIBS} ${g_libs})
${GTEST_LIBRARIES} benchmark ${yaml_libs} ${BRPC_LIBS} ${OS_LIBS} ${g_libs})
list(APPEND test_list ${TEST_TARGET_NAME})
endforeach()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
Expand All @@ -88,6 +88,6 @@ add_executable(toydb cmd/toydb.cc)
target_link_libraries(toydb toydb_lib toydb_sdk hybridse_sdk hybridse_core hybridse_flags )
# engine execution
add_executable(toydb_run_engine cmd/toydb_run_engine.cc)
target_link_libraries(toydb_run_engine toydb_lib toydb_sdk toydb_flags hybridse_flags hybridse_test_base gtest sqlite3)
target_link_libraries(toydb_run_engine toydb_lib toydb_sdk toydb_flags hybridse_flags hybridse_test_base ${GTEST_LIBRARIES} sqlite3)

set(test_list ${test_list} PARENT_SCOPE)
2 changes: 1 addition & 1 deletion hybridse/examples/toydb/src/bm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ if (TESTING_ENABLE AND EXAMPLES_TESTING_ENABLE)

target_link_libraries(${TEST_TARGET_NAME}
toydb_lib toydb_sdk toydb_bm_lib hybridse_sdk hybridse_flags
gtest benchmark ${yaml_libs} ${BRPC_LIBS} ${OS_LIBS} ${g_libs} sqlite3)
${GTEST_LIBRARIES} benchmark ${yaml_libs} ${BRPC_LIBS} ${OS_LIBS} ${g_libs} sqlite3)
list(APPEND test_list ${TEST_TARGET_NAME})
endforeach()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
Expand Down
2 changes: 1 addition & 1 deletion hybridse/examples/toydb/src/sdk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if (TESTING_ENABLE AND EXAMPLES_TESTING_ENABLE)
add_test(${TEST_TARGET_NAME}
${CMAKE_CURRENT_BINARY_DIR}/${TEST_TARGET_DIR}/${TEST_TARGET_NAME}
--gtest_output=xml:${CMAKE_BINARY_DIR}/${TEST_TARGET_NAME}.xml)
target_link_libraries(${TEST_TARGET_NAME} gtest toydb_sdk toydb_flags toydb_lib zetasql)
target_link_libraries(${TEST_TARGET_NAME} ${GTEST_LIBRARIES} toydb_sdk toydb_flags toydb_lib zetasql)
list(APPEND test_list ${TEST_TARGET_NAME})
endforeach()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
Expand Down
2 changes: 1 addition & 1 deletion hybridse/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if (LLVM_EXT_ENABLE)
endif ()

add_library(hybridse_flags STATIC ${CMAKE_CURRENT_SOURCE_DIR}/flags.cc)
target_link_libraries(hybridse_flags gflags)
target_link_libraries(hybridse_flags ${GFLAGS_LIBRARY})
# hybridse core library
add_library(hybridse_core STATIC ${SRC_FILE_LIST} $<TARGET_OBJECTS:hybridse_proto> case/case_data_mock.cc)
target_link_libraries(hybridse_core
Expand Down
6 changes: 3 additions & 3 deletions hybridse/src/benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ foreach(SRC_FILE ${BENCHMARK_FILES})
endif()
endforeach()
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(BENCHMARK_LIBS ${ABSL_LIBS} ${yaml_libs} ${g_libs} ${Boost_filesystem_LIBRARY} ${VM_LIBS} ${LLVM_LIBS} ${BRPC_LIBS} tcmalloc ${OS_LIB} benchmark gtest)
set(BENCHMARK_LIBS ${ABSL_LIBS} ${yaml_libs} ${g_libs} ${Boost_filesystem_LIBRARY} ${VM_LIBS} ${LLVM_LIBS} ${BRPC_LIBS} tcmalloc ${OS_LIB} benchmark ${GTEST_LIBRARIES})
elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(BENCHMARK_LIBS ${ABSL_LIBS} ${yaml_libs} ${g_libs} ${Boost_filesystem_LIBRARY} ${VM_LIBS} ${LLVM_LIBS} ${BRPC_LIBS} ${OS_LIB} benchmark gtest)
set(BENCHMARK_LIBS ${ABSL_LIBS} ${yaml_libs} ${g_libs} ${Boost_filesystem_LIBRARY} ${VM_LIBS} ${LLVM_LIBS} ${BRPC_LIBS} ${OS_LIB} benchmark ${GTEST_LIBRARIES})
endif ()
# bm lib
add_library(hybridse_bm_lib STATIC ${BENCHMARK_LIB_FILE_LIST})
Expand Down Expand Up @@ -70,7 +70,7 @@ if (TESTING_ENABLE AND HYBRIDSE_TESTING_ENABLE)

target_link_libraries(${TEST_TARGET_NAME}
hybridse_bm_lib hybridse_sdk hybridse_flags
gtest benchmark ${yaml_libs} ${BRPC_LIBS} ${OS_LIBS} ${g_libs})
${GTEST_LIBRARIES} benchmark ${yaml_libs} ${BRPC_LIBS} ${OS_LIBS} ${g_libs})
list(APPEND test_list ${TEST_TARGET_NAME})
endforeach()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
Expand Down
32 changes: 16 additions & 16 deletions hybridse/src/codegen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,82 +45,82 @@ set(vm_deps_libs
hybridse_case ${Boost_date_time_LIBRARY} ${Boost_filesystem_LIBRARY} ${yaml_libs} ${VM_LIBS} hybridse_flags ${LLVM_LIBS} ${BRPC_LIBS} ${OS_LIB})

add_executable(ir_base_builder_test ir_base_builder_test.cc)
target_link_libraries(ir_base_builder_test gtest ${vm_deps_libs})
target_link_libraries(ir_base_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs})
add_test(ir_base_builder_test ir_base_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/ir_base_builder_test.xml)
list(APPEND test_list ir_base_builder_test)

add_executable(string_ir_builder_test string_ir_builder_test.cc codegen_base_test.cc)
target_link_libraries(string_ir_builder_test gtest ${vm_deps_libs})
target_link_libraries(string_ir_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs})
add_test(string_ir_builder_test string_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/string_ir_builder_test.xml)
list(APPEND test_list string_ir_builder_test)

add_executable(timestamp_ir_builder_test timestamp_ir_builder_test.cc codegen_base_test.cc)
target_link_libraries(timestamp_ir_builder_test gtest ${vm_deps_libs})
target_link_libraries(timestamp_ir_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs})
add_test(timestamp_ir_builder_test timestamp_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/timestamp_ir_builder_test.xml)
list(APPEND test_list timestamp_ir_builder_test)


add_executable(date_ir_builder_test date_ir_builder_test.cc codegen_base_test.cc)
target_link_libraries(date_ir_builder_test gtest ${vm_deps_libs})
target_link_libraries(date_ir_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs})
add_test(date_ir_builder_test date_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/date_ir_builder_test.xml)
list(APPEND test_list date_ir_builder_test)

add_executable(variable_ir_builder_test variable_ir_builder_test.cc)
target_link_libraries(variable_ir_builder_test gtest ${vm_deps_libs})
target_link_libraries(variable_ir_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs})
add_test(variable_ir_builder_test variable_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/variable_ir_builder_test.xml)
list(APPEND test_list variable_ir_builder_test)

add_executable(cast_expr_ir_builder_test cast_expr_ir_builder_test.cc)
target_link_libraries(cast_expr_ir_builder_test gtest
target_link_libraries(cast_expr_ir_builder_test ${GTEST_LIBRARIES}
${vm_deps_libs})
add_test(cast_expr_ir_builder_test cast_expr_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/cast_expr_ir_builder_test.xml)
list(APPEND test_list cast_expr_ir_builder_test)

add_executable(arithmetic_expr_ir_builder_test arithmetic_expr_ir_builder_test.cc)
target_link_libraries(arithmetic_expr_ir_builder_test gtest
target_link_libraries(arithmetic_expr_ir_builder_test ${GTEST_LIBRARIES}
hybridse_udf ${vm_deps_libs})
add_test(arithmetic_expr_ir_builder_test arithmetic_expr_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/arithmetic_expr_ir_builder_test.xml)
list(APPEND test_list arithmetic_expr_ir_builder_test)

add_executable(predicate_expr_ir_builder_test predicate_expr_ir_builder_test.cc)
target_link_libraries(predicate_expr_ir_builder_test gtest
target_link_libraries(predicate_expr_ir_builder_test ${GTEST_LIBRARIES}
${vm_deps_libs})
add_test(predicate_expr_ir_builder_test predicate_expr_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/predicate_expr_ir_builder_test.xml)
list(APPEND test_list predicate_expr_ir_builder_test)


add_executable(expr_ir_builder_test expr_ir_builder_test.cc)
target_link_libraries(expr_ir_builder_test gtest ${vm_deps_libs} hybridse_vm)
target_link_libraries(expr_ir_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs} hybridse_vm)
add_test(expr_ir_builder_test expr_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/expr_ir_builder_test.xml)
list(APPEND test_list expr_ir_builder_test)


add_executable(block_ir_builder_test block_ir_builder_test.cc)
target_link_libraries(block_ir_builder_test gtest ${vm_deps_libs} hybridse_vm)
target_link_libraries(block_ir_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs} hybridse_vm)
add_test(block_ir_builder_test block_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/block_ir_builder_test.xml)
list(APPEND test_list block_ir_builder_test)

add_executable(udf_ir_builder_test udf_ir_builder_test.cc codegen_base_test)
target_link_libraries(udf_ir_builder_test gtest
target_link_libraries(udf_ir_builder_test ${GTEST_LIBRARIES}
${vm_deps_libs})
add_test(udf_ir_builder_test udf_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/udf_ir_builder_test.xml)
list(APPEND test_list udf_ir_builder_test)


add_executable(fn_ir_builder_test fn_ir_builder_test.cc codegen_base_test)
target_link_libraries(fn_ir_builder_test gtest
target_link_libraries(fn_ir_builder_test ${GTEST_LIBRARIES}
${vm_deps_libs} )
add_test(fn_ir_builder_test fn_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/fn_ir_builder_test.xml)
list(APPEND test_list fn_ir_builder_test)

add_executable(aggregate_ir_builder_test aggregate_ir_builder_test.cc codegen_base_test)
target_link_libraries(aggregate_ir_builder_test gtest ${vm_deps_libs} )
target_link_libraries(aggregate_ir_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs} )
add_test(aggregate_ir_builder_test aggregate_ir_builder_test --gtest_output=xml:${CMAKE_BINARY_DIR}/aggregate_ir_builder_test.xml)
list(APPEND test_list aggregate_ir_builder_test)


add_executable(buf_ir_builder_test buf_ir_builder_test.cc codegen_base_test.cc)
target_link_libraries(buf_ir_builder_test gtest
target_link_libraries(buf_ir_builder_test ${GTEST_LIBRARIES}
${vm_deps_libs})

add_test(buf_ir_builder_test buf_ir_builder_test
Expand All @@ -129,13 +129,13 @@ list(APPEND test_list buf_ir_builder_test)

add_executable(list_ir_builder_test list_ir_builder_test.cc codegen_base_test.cc)
target_link_options(list_ir_builder_test PUBLIC -rdynamic)
target_link_libraries(list_ir_builder_test gtest ${vm_deps_libs})
target_link_libraries(list_ir_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs})
add_test(list_ir_builder_test list_ir_builder_test
--gtest_output=xml:${CMAKE_BINARY_DIR}/list_ir_builder_test.xml)
list(APPEND test_list list_ir_builder_test)

add_executable(fn_let_ir_builder_test fn_let_ir_builder_test.cc codegen_base_test)
target_link_libraries(fn_let_ir_builder_test gtest ${vm_deps_libs})
target_link_libraries(fn_let_ir_builder_test ${GTEST_LIBRARIES} ${vm_deps_libs})
add_test(fn_let_ir_builder_test fn_let_ir_builder_test
--gtest_output=xml:${CMAKE_BINARY_DIR}/fn_let_ir_builder_test.xml)
list(APPEND test_list fn_let_ir_builder_test)
Expand Down
4 changes: 2 additions & 2 deletions hybridse/src/planv2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ target_link_libraries(hybridse_planner_v2 ${ZETASQL_LIBS} hybridse_core glog)
add_executable(ast_node_converter_test ast_node_converter_test.cc)
target_link_libraries(ast_node_converter_test gtest hybridse_planner_v2 hybridse_core glog
target_link_libraries(ast_node_converter_test ${GTEST_LIBRARIES} hybridse_planner_v2 hybridse_core ${GLOG_LIBRARY}
${ZETASQL_LIBS} ${GTEST_LIBRARIES})
add_test(ast_node_converter_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ast_node_converter_test --gtest_output=xml:${CMAKE_BINARY_DIR}/ast_node_converter_test.xml)
list(APPEND test_list planner_v2_test)
add_executable(planner_v2_test planner_v2_test.cc)
target_link_libraries(planner_v2_test gtest hybridse_planner_v2 hybridse_core glog
target_link_libraries(planner_v2_test ${GTEST_LIBRARIES} hybridse_planner_v2 hybridse_core ${GLOG_LIBRARY}
${ZETASQL_LIBS} ${GTEST_LIBRARIES})
add_test(planner_v2_test ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/planner_v2_test --gtest_output=xml:${CMAKE_BINARY_DIR}/planner_v2_test.xml)
Expand Down
4 changes: 2 additions & 2 deletions hybridse/src/sdk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if(SQL_JAVASDK_ENABLE)
SOURCES hybridse_interface_core.i)
target_include_directories(hybridse_jsdk_core PRIVATE ${JNI_INCLUDE_DIRS})
target_compile_options(hybridse_jsdk_core PRIVATE -w)
target_link_libraries(hybridse_jsdk_core PRIVATE glog ${sdk_core_deps_libs})
target_link_libraries(hybridse_jsdk_core PRIVATE ${GLOG_LIBRARY} ${sdk_core_deps_libs})

if(APPLE)
set_target_properties(hybridse_jsdk_core PROPERTIES
Expand All @@ -64,7 +64,7 @@ if(SQL_JAVASDK_ENABLE)
SOURCES hybridse_interface_core.i)
target_include_directories(hybridse_jsdk_core_static PRIVATE ${JNI_INCLUDE_DIRS})
target_compile_options(hybridse_jsdk_core_static PRIVATE -w)
target_link_libraries(hybridse_jsdk_core_static PRIVATE glog ${sdk_core_deps_libs})
target_link_libraries(hybridse_jsdk_core_static PRIVATE ${GLOG_LIBRARY} ${sdk_core_deps_libs})

add_custom_target(
cp_hybridse_native_so ALL
Expand Down
6 changes: 3 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ function(compile_test DIR)
add_executable(${TEST_TARGET_NAME} ${SRC_FILE} $<TARGET_OBJECTS:openmldb_proto>)
list(APPEND test_list ${TEST_TARGET_NAME})
if (${TEST_TARGET_NAME} STREQUAL "tablet_impl_mem_test")
target_link_libraries(${TEST_TARGET_NAME} tcmalloc ${TEST_LIBS} gtest)
target_link_libraries(${TEST_TARGET_NAME} tcmalloc ${TEST_LIBS} ${GTEST_LIBRARIES})
else()
target_link_libraries(${TEST_TARGET_NAME} ${TEST_LIBS} gtest)
target_link_libraries(${TEST_TARGET_NAME} ${TEST_LIBS} ${GTEST_LIBRARIES})
endif()
set_target_properties(${TEST_TARGET_NAME}
PROPERTIES
Expand Down Expand Up @@ -120,7 +120,7 @@ endif()

add_executable(parse_log tools/parse_log.cc $<TARGET_OBJECTS:openmldb_proto>)

set(LINK_LIBS log openmldb_proto base protobuf glog gflags ssl crypto z snappy dl pthread)
set(LINK_LIBS log openmldb_proto base ${PROTOBUF_LIBRARY} ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${OPENSSL_LIBRARIES} ${Z_LIBRARY} ${SNAPPY_LIBRARY} dl pthread)
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND LINK_LIBS unwind)
endif()
Expand Down
20 changes: 10 additions & 10 deletions src/sdk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,34 @@ if(TESTING_ENABLE)
set(HYBRIDSE_CASE_LIBS base_test yaml-cpp)

add_executable(db_sdk_test db_sdk_test.cc)
target_link_libraries(db_sdk_test ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS} benchmark_main benchmark gtest)
target_link_libraries(db_sdk_test ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS} benchmark_main benchmark ${GTEST_LIBRARIES})

add_executable(sql_router_test sql_router_test.cc)
target_link_libraries(sql_router_test ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS} benchmark_main benchmark gtest)
target_link_libraries(sql_router_test ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS} benchmark_main benchmark ${GTEST_LIBRARIES})

add_executable(sql_standalone_sdk_test sql_standalone_sdk_test.cc)
target_link_libraries(sql_standalone_sdk_test gtest ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})
target_link_libraries(sql_standalone_sdk_test ${GTEST_LIBRARIES} ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})

add_executable(sql_sdk_test sql_sdk_test.cc)
target_link_libraries(sql_sdk_test gtest ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})
target_link_libraries(sql_sdk_test ${GTEST_LIBRARIES} ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})

add_executable(sql_cluster_test sql_cluster_test.cc)
target_link_libraries(sql_cluster_test gtest ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})
target_link_libraries(sql_cluster_test ${GTEST_LIBRARIES} ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})

add_executable(sql_request_row_test sql_request_row_test.cc)
target_link_libraries(sql_request_row_test ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS} ${ZETASQL_LIBS} benchmark_main benchmark gtest)
target_link_libraries(sql_request_row_test ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS} ${ZETASQL_LIBS} benchmark_main benchmark ${GTEST_LIBRARIES})

add_executable(mini_cluster_batch_bm mini_cluster_batch_bm.cc)
target_link_libraries(mini_cluster_batch_bm mini_cluster_bm_common benchmark_main benchmark gtest ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})
target_link_libraries(mini_cluster_batch_bm mini_cluster_bm_common benchmark_main benchmark ${GTEST_LIBRARIES} ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})

add_executable(mini_cluster_request_batch_bm mini_cluster_request_batch_bm.cc)
target_link_libraries(mini_cluster_request_batch_bm mini_cluster_bm_common benchmark_main benchmark gtest ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})
target_link_libraries(mini_cluster_request_batch_bm mini_cluster_bm_common benchmark_main benchmark ${GTEST_LIBRARIES} ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})

add_executable(mini_cluster_request_bm mini_cluster_request_bm.cc)
target_link_libraries(mini_cluster_request_bm mini_cluster_bm_common benchmark_main benchmark gtest ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})
target_link_libraries(mini_cluster_request_bm mini_cluster_bm_common benchmark_main benchmark ${GTEST_LIBRARIES} ${BIN_LIBS} ${HYBRIDSE_CASE_LIBS})
endif()

set(SDK_LIBS openmldb_sdk openmldb_catalog client zk_client schema openmldb_flags openmldb_codec openmldb_proto base hybridse_sdk zookeeper_mt ${VM_LIBS} ${LLVM_LIBS} ${BRPC_LIBS} ${ZETASQL_LIBS})
set(SDK_LIBS openmldb_sdk openmldb_catalog client zk_client schema openmldb_flags openmldb_codec openmldb_proto base hybridse_sdk zookeeper_mt)

if(SQL_PYSDK_ENABLE)
find_package(Python3 COMPONENTS Interpreter Development)
Expand Down

0 comments on commit e71190c

Please sign in to comment.