Merge branch 'master' of https://github.com/sogou/workflow into nossl

This commit is contained in:
Xie Han
2025-06-20 22:35:13 +08:00
3 changed files with 25 additions and 19 deletions

View File

@@ -13,6 +13,7 @@ find_package(OpenSSL REQUIRED)
find_package(workflow REQUIRED CONFIG HINTS ..)
include_directories(${OPENSSL_INCLUDE_DIR} ${WORKFLOW_INCLUDE_DIR})
link_directories(${WORKFLOW_LIB_DIR})
find_library(WORKFLOW_LIB NAMES libworkflow.a workflow HINTS ${WORKFLOW_LIB_DIR})
if (WIN32)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP /wd4200")
@@ -31,14 +32,14 @@ set(BENCHMARK_LIST
)
if (APPLE)
set(WORKFLOW_LIB workflow pthread OpenSSL::SSL OpenSSL::Crypto)
set(LIB ${WORKFLOW_LIB} pthread OpenSSL::SSL OpenSSL::Crypto)
else ()
set(WORKFLOW_LIB workflow pthread OpenSSL::SSL OpenSSL::Crypto ${LIBRT})
set(LIB ${WORKFLOW_LIB} pthread OpenSSL::SSL OpenSSL::Crypto ${LIBRT})
endif ()
foreach(src ${BENCHMARK_LIST})
string(REPLACE "-" ";" arr ${src})
list(GET arr -1 bin_name)
add_executable(${bin_name} ${src}.cc)
target_link_libraries(${bin_name} ${WORKFLOW_LIB})
target_link_libraries(${bin_name} ${LIB})
endforeach()

View File

@@ -11,6 +11,7 @@ find_package(OpenSSL REQUIRED)
find_package(workflow REQUIRED CONFIG HINTS ..)
include_directories(${OPENSSL_INCLUDE_DIR} ${WORKFLOW_INCLUDE_DIR})
link_directories(${WORKFLOW_LIB_DIR})
find_library(WORKFLOW_LIB NAMES libworkflow.a workflow HINTS ${WORKFLOW_LIB_DIR})
find_program(CMAKE_MEMORYCHECK_COMMAND valgrind)
set(memcheck_command ${CMAKE_MEMORYCHECK_COMMAND} ${CMAKE_MEMORYCHECK_COMMAND_OPTIONS} --error-exitcode=1 --leak-check=full)
@@ -50,14 +51,14 @@ set(TEST_LIST
)
if (APPLE)
set(WORKFLOW_LIB workflow pthread)
set(LIB ${WORKFLOW_LIB} pthread OpenSSL::Crypto)
else ()
set(WORKFLOW_LIB workflow pthread ${LIBRT})
set(LIB ${WORKFLOW_LIB} pthread OpenSSL::Crypto ${LIBRT})
endif ()
foreach(src ${TEST_LIST})
add_executable(${src} EXCLUDE_FROM_ALL ${src}.cc)
target_link_libraries(${src} ${WORKFLOW_LIB} GTest::GTest GTest::Main)
target_link_libraries(${src} ${LIB} GTest::GTest GTest::Main)
add_test(${src} ${src})
add_dependencies(check ${src})
endforeach()

View File

@@ -14,13 +14,17 @@ else()
find_library(LIBRT rt)
find_package(OpenSSL REQUIRED)
endif()
find_package(workflow REQUIRED CONFIG HINTS ..)
include_directories(${OPENSSL_INCLUDE_DIR} ${WORKFLOW_INCLUDE_DIR})
link_directories(${WORKFLOW_LIB_DIR})
find_library(WORKFLOW_LIB NAMES libworkflow.a workflow HINTS ${WORKFLOW_LIB_DIR})
if (KAFKA STREQUAL "y")
find_path(SNAPPY_INCLUDE_PATH NAMES snappy.h)
include_directories(${SNAPPY_INCLUDE_PATH})
find_library(WFKAFKA_LIB NAMES libwfkafka.a wfkafka HINTS ${WORKFLOW_LIB_DIR})
endif ()
if (WIN32)
@@ -50,18 +54,18 @@ set(TUTORIAL_LIST
)
if (APPLE)
set(WORKFLOW_LIB workflow pthread)
set(LIB ${WORKFLOW_LIB} pthread OpenSSL::Crypto)
elseif (ANDROID)
set(WORKFLOW_LIB workflow c)
set(LIB ${WORKFLOW_LIB} crypto c)
else ()
set(WORKFLOW_LIB workflow pthread ${LIBRT})
set(LIB ${WORKFLOW_LIB} pthread OpenSSL::Crypto ${LIBRT})
endif ()
foreach(src ${TUTORIAL_LIST})
string(REPLACE "-" ";" arr ${src})
list(GET arr -1 bin_name)
add_executable(${bin_name} ${src}.cc)
target_link_libraries(${bin_name} ${WORKFLOW_LIB})
target_link_libraries(${bin_name} ${LIB})
endforeach()
if (NOT REDIS STREQUAL "n")
@@ -74,7 +78,7 @@ foreach(src ${TUTORIAL_LIST})
string(REPLACE "-" ";" arr ${src})
list(GET arr -1 bin_name)
add_executable(${bin_name} ${src}.cc)
target_link_libraries(${bin_name} ${WORKFLOW_LIB})
target_link_libraries(${bin_name} ${LIB})
endforeach()
endif()
@@ -86,7 +90,7 @@ foreach(src ${TUTORIAL_LIST})
string(REPLACE "-" ";" arr ${src})
list(GET arr -1 bin_name)
add_executable(${bin_name} ${src}.cc)
target_link_libraries(${bin_name} ${WORKFLOW_LIB})
target_link_libraries(${bin_name} ${LIB})
endforeach()
endif()
@@ -98,13 +102,13 @@ foreach(src ${TUTORIAL_LIST})
string(REPLACE "-" ";" arr ${src})
list(GET arr -1 bin_name)
add_executable(${bin_name} ${src}.cc)
target_link_libraries(${bin_name} ${WORKFLOW_LIB})
target_link_libraries(${bin_name} ${LIB})
endforeach()
endif()
if (KAFKA STREQUAL "y")
add_executable("kafka_cli" "tutorial-13-kafka_cli.cc")
target_link_libraries("kafka_cli" wfkafka ${WORKFLOW_LIB} z snappy lz4 zstd)
target_link_libraries("kafka_cli" ${WFKAFKA_LIB} ${LIB} z snappy lz4 zstd)
endif ()
set(DIR10 tutorial-10-user_defined_protocol)
@@ -112,10 +116,10 @@ add_executable(server ${DIR10}/server.cc ${DIR10}/message.cc)
add_executable(client ${DIR10}/client.cc ${DIR10}/message.cc)
add_executable(server-uds ${DIR10}/server-uds.cc ${DIR10}/message.cc)
add_executable(client-uds ${DIR10}/client-uds.cc ${DIR10}/message.cc)
target_link_libraries(server ${WORKFLOW_LIB})
target_link_libraries(client ${WORKFLOW_LIB})
target_link_libraries(server-uds ${WORKFLOW_LIB})
target_link_libraries(client-uds ${WORKFLOW_LIB})
target_link_libraries(server ${LIB})
target_link_libraries(client ${LIB})
target_link_libraries(server-uds ${LIB})
target_link_libraries(client-uds ${LIB})
set_target_properties(server PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/${DIR10})
@@ -129,7 +133,7 @@ set_target_properties(client-uds PROPERTIES
set(DIR16 tutorial-16-graceful_restart)
add_executable(bootstrap ${DIR16}/bootstrap.c)
add_executable(bootstrap_server ${DIR16}/server.cc)
target_link_libraries(bootstrap_server ${WORKFLOW_LIB})
target_link_libraries(bootstrap_server ${LIB})
set_target_properties(bootstrap PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/${DIR16})