Commit c5dbaae2 authored by zhujiashun's avatar zhujiashun

remove unnecessary proto generating code

parent 1ac67120
...@@ -121,26 +121,6 @@ foreach(PROTO ${PROTOS}) ...@@ -121,26 +121,6 @@ foreach(PROTO ${PROTOS})
) )
endforeach() endforeach()
file(GLOB brpc_PROTOS "src/brpc/*.proto")
foreach(PROTO ${brpc_PROTOS})
get_filename_component(PROTO_WE ${PROTO} NAME_WE)
list(APPEND PROTO_SRCS "${CMAKE_CURRENT_BINARY_DIR}/brpc/${PROTO_WE}.pb.cc")
execute_process(
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTO_FLAGS} --cpp_out=${CMAKE_CURRENT_BINARY_DIR} --proto_path=${PROTOBUF_INCLUDE_DIR} --proto_path=${CMAKE_SOURCE_DIR}/src --proto_path=${CMAKE_SOURCE_DIR}/src/brpc/ ${PROTO}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
endforeach()
file(GLOB brpc_policy_PROTOS "src/brpc/policy/*.proto")
foreach(PROTO ${brpc_policy_PROTOS})
get_filename_component(PROTO_WE ${PROTO} NAME_WE)
list(APPEND PROTO_SRCS "${CMAKE_CURRENT_BINARY_DIR}/brpc/policy/${PROTO_WE}.pb.cc")
execute_process(
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTO_FLAGS} --cpp_out=${CMAKE_CURRENT_BINARY_DIR} --proto_path=${PROTOBUF_INCLUDE_DIR} --proto_path=${CMAKE_SOURCE_DIR}/src --proto_path=${CMAKE_SOURCE_DIR}/src/brpc/policy ${PROTO}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
endforeach()
set(BUTIL_SOURCES set(BUTIL_SOURCES
${CMAKE_SOURCE_DIR}/src/butil/third_party/dmg_fp/g_fmt.cc ${CMAKE_SOURCE_DIR}/src/butil/third_party/dmg_fp/g_fmt.cc
${CMAKE_SOURCE_DIR}/src/butil/third_party/dmg_fp/dtoa_wrapper.cc ${CMAKE_SOURCE_DIR}/src/butil/third_party/dmg_fp/dtoa_wrapper.cc
...@@ -289,15 +269,13 @@ set(SOURCES ...@@ -289,15 +269,13 @@ set(SOURCES
${BRPC_SOURCES4} ${BRPC_SOURCES4}
${PROTO_SRCS} ${PROTO_SRCS}
) )
ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(src)
if(BUILD_EXAMPLE) if(BUILD_EXAMPLE)
ADD_SUBDIRECTORY(example) ADD_SUBDIRECTORY(example)
endif() endif()
if(BUILD_UNIT_TESTS) if(BUILD_UNIT_TESTS)
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)
#enable_testing()
#add_test(NAME test_butil COMMAND test_butil)
endif() endif()
#install directory #install directory
......
...@@ -39,4 +39,3 @@ install(TARGETS brpc ...@@ -39,4 +39,3 @@ install(TARGETS brpc
LIBRARY DESTINATION lib${LIBSUFFIX} LIBRARY DESTINATION lib${LIBSUFFIX}
ARCHIVE DESTINATION lib${LIBSUFFIX} ARCHIVE DESTINATION lib${LIBSUFFIX}
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment