Skip to content

Commit a16ac86

Browse files
poor-circlepoor-circle
committed
fix
1 parent 60a95e4 commit a16ac86

File tree

2 files changed

+65
-65
lines changed

2 files changed

+65
-65
lines changed

‎src/struct_pack/benchmark/CMakeLists.txt

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/benchmark)
2-
# find_package(Protobuf QUIET)
3-
# add_executable(struct_pack_benchmark benchmark.cpp no_op.cpp)
4-
# if (Protobuf_FOUND)
5-
# message(STATUS "Protobuf_FOUND: ${Protobuf_FOUND}")
6-
# protobuf_generate_cpp(STRUCT_PACK_BENCHMARK_PROTO_SRCS
7-
# STRUCT_PACK_BENCHMARK_PROTO_HDRS
8-
# data_def.proto
9-
# )
10-
# target_include_directories(struct_pack_benchmark PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
11-
# target_sources(struct_pack_benchmark PRIVATE
12-
# ${STRUCT_PACK_BENCHMARK_PROTO_SRCS}
13-
# ${STRUCT_PACK_BENCHMARK_PROTO_HDRS}
14-
# )
15-
# target_link_libraries(struct_pack_benchmark PRIVATE protobuf::libprotobuf)
1+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/benchmark)
2+
find_package(Protobuf QUIET)
3+
add_executable(struct_pack_benchmark benchmark.cpp no_op.cpp)
4+
if (Protobuf_FOUND)
5+
message(STATUS "Protobuf_FOUND: ${Protobuf_FOUND}")
6+
protobuf_generate_cpp(STRUCT_PACK_BENCHMARK_PROTO_SRCS
7+
STRUCT_PACK_BENCHMARK_PROTO_HDRS
8+
data_def.proto
9+
)
10+
target_include_directories(struct_pack_benchmark PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
11+
target_sources(struct_pack_benchmark PRIVATE
12+
${STRUCT_PACK_BENCHMARK_PROTO_SRCS}
13+
${STRUCT_PACK_BENCHMARK_PROTO_HDRS}
14+
)
15+
target_link_libraries(struct_pack_benchmark PRIVATE protobuf::libprotobuf)
1616

17-
# target_compile_definitions(struct_pack_benchmark PRIVATE HAVE_PROTOBUF)
18-
# endif ()
17+
target_compile_definitions(struct_pack_benchmark PRIVATE HAVE_PROTOBUF)
18+
endif ()
1919

20-
# target_compile_definitions(struct_pack_benchmark PRIVATE MSGPACK_NO_BOOST)
21-
# target_compile_definitions(struct_pack_benchmark PRIVATE STRUCT_PACK_OPTIMIZE)
22-
# find_package(Flatbuffers QUIET)
23-
# if (Flatbuffers_FOUND)
24-
# message(STATUS "Flatbuffers_FOUND: ${Flatbuffers_FOUND}")
25-
# execute_process(
26-
# COMMAND flatc ./data_def.fbs --cpp
27-
# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
28-
# )
29-
# target_compile_definitions(struct_pack_benchmark PRIVATE HAVE_FLATBUFFER)
30-
# endif()
20+
target_compile_definitions(struct_pack_benchmark PRIVATE MSGPACK_NO_BOOST)
21+
target_compile_definitions(struct_pack_benchmark PRIVATE STRUCT_PACK_OPTIMIZE)
22+
find_package(Flatbuffers QUIET)
23+
if (Flatbuffers_FOUND)
24+
message(STATUS "Flatbuffers_FOUND: ${Flatbuffers_FOUND}")
25+
execute_process(
26+
COMMAND flatc ./data_def.fbs --cpp
27+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
28+
)
29+
target_compile_definitions(struct_pack_benchmark PRIVATE HAVE_FLATBUFFER)
30+
endif()

‎src/struct_pb/tests/CMakeLists.txt

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
# find_package(Protobuf QUIET)
2-
# if("${yaLanTingLibs_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
3-
# # If this is a subproject in ylt
4-
# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/tests)
5-
# else()
6-
# # else find installed yalantinglibs
7-
# cmake_minimum_required(VERSION 3.15)
8-
# project(struct_pb_test)
9-
# set(CMAKE_CXX_STANDARD 17)
10-
# set(CMAKE_CXX_STANDARD_REQUIRED ON)
11-
# set(CMAKE_INCLUDE_CURRENT_DIR ON)
12-
# # if you have install ylt
13-
# find_package(yalantinglibs REQUIRED)
14-
# link_libraries(yalantinglibs::yalantinglibs)
15-
# # else
16-
# # include_directories(include)
17-
# # include_directories(include/ylt/thirdparty)
18-
# endif()
1+
find_package(Protobuf QUIET)
2+
if("${yaLanTingLibs_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
3+
# If this is a subproject in ylt
4+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/output/tests)
5+
else()
6+
# else find installed yalantinglibs
7+
cmake_minimum_required(VERSION 3.15)
8+
project(struct_pb_test)
9+
set(CMAKE_CXX_STANDARD 17)
10+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
11+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
12+
# if you have install ylt
13+
find_package(yalantinglibs REQUIRED)
14+
link_libraries(yalantinglibs::yalantinglibs)
15+
# else
16+
# include_directories(include)
17+
# include_directories(include/ylt/thirdparty)
18+
endif()
1919

20-
# set(TEST_PROTO main.cpp)
20+
set(TEST_PROTO main.cpp)
2121

22-
# if (TEST_STRUCT_PB_WITH_PROTO)
23-
# message(STATUS "Gen proto files")
24-
# add_definitions(-DSTRUCT_PB_WITH_PROTO)
25-
# message(STATUS "Found Protobuf: ${Protobuf_VERSION}")
26-
# include_directories(${Protobuf_INCLUDE_DIRS})
27-
# include_directories(${CMAKE_CURRENT_BINARY_DIR})
28-
# set(PROTO_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/)
29-
# file(GLOB PROTO_FILES ${PROTO_SRC_DIR}/*.proto)
22+
if (TEST_STRUCT_PB_WITH_PROTO)
23+
message(STATUS "Gen proto files")
24+
add_definitions(-DSTRUCT_PB_WITH_PROTO)
25+
message(STATUS "Found Protobuf: ${Protobuf_VERSION}")
26+
include_directories(${Protobuf_INCLUDE_DIRS})
27+
include_directories(${CMAKE_CURRENT_BINARY_DIR})
28+
set(PROTO_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/)
29+
file(GLOB PROTO_FILES ${PROTO_SRC_DIR}/*.proto)
3030

31-
# protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES})
32-
# # message(STATUS "Proto source files: ${PROTO_SRCS}")
33-
# # message(STATUS "Proto header files: ${PROTO_HDRS}")
34-
# add_executable(struct_pb_test ${PROTO_SRCS} ${TEST_PROTO})
35-
# target_link_libraries(struct_pb_test PRIVATE protobuf::libprotobuf)
36-
# add_test(NAME struct_pb_test COMMAND struct_pb_test)
37-
# else()
38-
# add_executable(struct_pb_test ${TEST_PROTO})
39-
# add_test(NAME struct_pb_test COMMAND struct_pb_test)
40-
# endif()
31+
protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_FILES})
32+
# message(STATUS "Proto source files: ${PROTO_SRCS}")
33+
# message(STATUS "Proto header files: ${PROTO_HDRS}")
34+
add_executable(struct_pb_test ${PROTO_SRCS} ${TEST_PROTO})
35+
target_link_libraries(struct_pb_test PRIVATE protobuf::libprotobuf)
36+
add_test(NAME struct_pb_test COMMAND struct_pb_test)
37+
else()
38+
add_executable(struct_pb_test ${TEST_PROTO})
39+
add_test(NAME struct_pb_test COMMAND struct_pb_test)
40+
endif()

0 commit comments

Comments
 (0)