diff --git a/cmake/Protobuf.cmake b/cmake/Protobuf.cmake deleted file mode 100644 index c99c2dd71..000000000 --- a/cmake/Protobuf.cmake +++ /dev/null @@ -1,182 +0,0 @@ -set(Protobuf_PROTOC_EXECUTABLE "${EXTERNALS_BIN}/protoc") -set(PROTOBUF_INCLUDE_DIRS "${EXTERNALS_INCLUDE}") -set(PROTOBUF_STATIC_LIB "libprotobuf") -set(_protobuf_src_dir ${CMAKE_SOURCE_DIR}/src/lib_spark) -set(_protobuf_bin_dir ${CMAKE_BINARY_DIR}/src/lib_spark) - -function(Protobuf_Generate_Cpp) - set(_options) - set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR) - set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES) - cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) - set(${_ARGS_CXX_SOURCES}) - set(${_ARGS_CXX_HEADERS}) - - set(_proto_include_cli_args) - foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS}) - list(APPEND _proto_include_cli_args -I ${_dir}) - endforeach() - - foreach(FIL ${_ARGS_PROTO_SOURCES}) - get_filename_component(ABS_FIL ${FIL} ABSOLUTE) - get_filename_component(FIL_WE ${FIL} NAME_WE) - get_filename_component(FIL_DIR ${FIL} DIRECTORY) - if(FIL_DIR) - set(FIL_WE "${FIL_DIR}/${FIL_WE}") - endif() - - list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc") - list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h") - - add_custom_command( - OUTPUT - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h" - COMMAND - ${Protobuf_PROTOC_EXECUTABLE} - ARGS - --cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${ABS_FIL} - DEPENDS ${ABS_FIL} - COMMENT "Running C++ protocol buffer compiler on ${FIL}" - VERBATIM - ) - endforeach() - - set_source_files_properties( - ${${_ARGS_CXX_SOURCES}} - ${${_ARGS_CXX_HEADERS}} - PROPERTIES - GENERATED TRUE - ) - - # remove some warnings from protobuf generated files - if(WIN32) - set_source_files_properties( - ${${_ARGS_CXX_SOURCES}} - PROPERTIES - COMPILE_FLAGS "/wd4309 /wd4838" - ) - else() - set_source_files_properties( - ${${_ARGS_CXX_SOURCES}} - PROPERTIES - COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized" - ) - endif() - - set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE) - set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE) -endfunction() - -function(Service_Compiler_Generate_Cpp) - set(_options) - set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR) - set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES) - cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) - set(${_ARGS_CXX_SOURCES}) - set(${_ARGS_CXX_HEADERS}) - - set(_proto_include_cli_args) - foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS}) - list(APPEND _proto_include_cli_args -I ${_dir}) - endforeach() - - foreach(FIL ${_ARGS_PROTO_SOURCES}) - get_filename_component(ABS_FIL ${FIL} ABSOLUTE) - get_filename_component(FIL_WE ${FIL} NAME_WE) - get_filename_component(FIL_DIR ${FIL} DIRECTORY) - if(FIL_DIR) - set(FIL_WE "${FIL_DIR}/${FIL_WE}") - endif() - - list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc") - list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h") - - list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc") - list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h") - - list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc") - list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h") - - set(TEMPLATES - ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc - ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h - ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc - ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h - ) - - set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py) - if(WIN32) - set(_plugin_cmd ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.cmd) - add_custom_command( - OUTPUT - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h" - COMMAND SET PYTHONPATH=${SPARK_PYTHON} - COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat - COMMAND - ${Protobuf_PROTOC_EXECUTABLE} - ARGS - --cpp_out=${_ARGS_CXX_OUT_DIR} - --plugin=protoc-gen-service=${_plugin_cmd} - --service_out=lang=cpp:${_ARGS_CXX_OUT_DIR} - -I ${PROTOBUF_INCLUDE_DIRS} - -I ${_protobuf_src_dir} - ${ABS_FIL} - DEPENDS - ${ABS_FIL} - ${TEMPLATES} - ${_plugin_cmd} - ${_plugin_py} - COMMENT "Running C++ service compiler on ${FIL}" - VERBATIM - ) - else() - add_custom_command( - OUTPUT - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc" - "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h" - COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh - ARGS - ${Protobuf_PROTOC_EXECUTABLE} - --cpp_out=${_ARGS_CXX_OUT_DIR} - --plugin=protoc-gen-service=${_plugin_py} - --service_out=lang=cpp,make_file_name=${ABS_FIL}:${_ARGS_CXX_OUT_DIR} - ${_proto_include_cli_args} ${ABS_FIL} - DEPENDS - ${ABS_FIL} - ${TEMPLATES} - ${_plugin_py} - COMMENT "Running C++ service compiler on ${FIL}" - VERBATIM - ) - endif() - endforeach() - - # remove some warnings from protobuf generated files - if(WIN32) - set_source_files_properties( - ${${_ARGS_CXX_SOURCES}} - PROPERTIES - COMPILE_FLAGS "/wd4309 /wd4838" - ) - else() - set_source_files_properties( - ${${_ARGS_CXX_SOURCES}} - PROPERTIES - COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized" - ) - endif() - - set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE) - set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE) -endfunction() - diff --git a/cmake/ProtobufGenerateCpp.cmake b/cmake/ProtobufGenerateCpp.cmake new file mode 100644 index 000000000..f949ca7e4 --- /dev/null +++ b/cmake/ProtobufGenerateCpp.cmake @@ -0,0 +1,75 @@ +include_guard(GLOBAL) + +function(protobuf_generate_cpp) + set(_options) + set(_one_value_args + CXX_SOURCES + CXX_HEADERS + CXX_OUT_DIR + PROTOC + ) + set(_multi_value_args + PROTO_INCLUDE_DIRS + PROTO_SOURCES + ) + cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) + + if (NOT DEFINED _ARGS_PROTOC) + set(_ARGS_PROTOC "${EXTERNALS_BIN}/protoc") + endif() + set(${_ARGS_CXX_SOURCES}) + set(${_ARGS_CXX_HEADERS}) + + set(_proto_include_cli_args) + foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS}) + list(APPEND _proto_include_cli_args -I ${_dir}) + endforeach() + + foreach(_fil ${_ARGS_PROTO_SOURCES}) + get_filename_component(_abs_fil ${_fil} ABSOLUTE) + get_filename_component(_fil_we ${_fil} NAME_WE) + get_filename_component(_fil_dir ${_fil} DIRECTORY) + if(_fil_dir) + set(_fil_we "${_fil_dir}/${_fil_we}") + endif() + list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc") + list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h") + add_custom_command( + OUTPUT + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h" + COMMAND + ${_ARGS_PROTOC} + ARGS + --cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${_abs_fil} + DEPENDS ${_abs_fil} + COMMENT "Running C++ protocol buffer compiler on ${_fil}" + VERBATIM + ) + endforeach() + + set_source_files_properties( + ${${_ARGS_CXX_SOURCES}} + ${${_ARGS_CXX_HEADERS}} + PROPERTIES + GENERATED TRUE + ) + + # remove some warnings from protobuf generated files + if(WIN32) + set_source_files_properties( + ${${_ARGS_CXX_SOURCES}} + PROPERTIES + COMPILE_FLAGS "/wd4309 /wd4838" + ) + else() + set_source_files_properties( + ${${_ARGS_CXX_SOURCES}} + PROPERTIES + COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized" + ) + endif() + + set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE) + set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE) +endfunction() diff --git a/src/app_sparkd/CMakeLists.txt b/src/app_sparkd/CMakeLists.txt index 07cea833b..31c082929 100644 --- a/src/app_sparkd/CMakeLists.txt +++ b/src/app_sparkd/CMakeLists.txt @@ -3,7 +3,7 @@ project(sparkd) include(FetchContent) include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) -include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake) include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake) include(GNUInstallDirs) diff --git a/src/lib_spark/CMakeLists.txt b/src/lib_spark/CMakeLists.txt index c64fd98b1..7cca37c77 100644 --- a/src/lib_spark/CMakeLists.txt +++ b/src/lib_spark/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.5) project(spark) include(GNUInstallDirs) include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) -include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ProtobufGenerateCppService.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GenerateDefaultConfig.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/GenerateConfigProfile.cmake) include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake) @@ -54,7 +55,7 @@ protobuf_generate_cpp( ${_non_cfg_protos} ${_cfg_protos} ) -service_compiler_generate_cpp( +protobuf_generate_cpp_service( CXX_SOURCES SERVICE_COMPILER_SRCS CXX_HEADERS SERVICE_COMPILER_HDRS CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/protobufs diff --git a/src/lib_spark/cmake/ProtobufGenerateCppService.cmake b/src/lib_spark/cmake/ProtobufGenerateCppService.cmake new file mode 100644 index 000000000..7a4964d49 --- /dev/null +++ b/src/lib_spark/cmake/ProtobufGenerateCppService.cmake @@ -0,0 +1,121 @@ +include_guard(DIRECTORY) + +function(protobuf_generate_cpp_service) + set(_options) + set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR PROTOC) + set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES) + cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN}) + + if (NOT DEFINED _ARGS_PROTOC) + set(_ARGS_PROTOC "${EXTERNALS_BIN}/protoc") + endif() + set(${_ARGS_CXX_SOURCES}) + set(${_ARGS_CXX_HEADERS}) + + set(_proto_include_cli_args) + foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS}) + list(APPEND _proto_include_cli_args -I ${_dir}) + endforeach() + + foreach(_fil ${_ARGS_PROTO_SOURCES}) + get_filename_component(_abs_fil ${_fil} ABSOLUTE) + get_filename_component(_fil_we ${_fil} NAME_WE) + get_filename_component(_fil_dir ${_fil} DIRECTORY) + if(_fil_dir) + set(_fil_we "${_fil_dir}/${_fil_we}") + endif() + + list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc") + list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h") + list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.client.pb.cc") + list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.client.pb.h") + list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.server.pb.cc") + list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.server.pb.h") + + set(_templates + ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/api/service_compiler/templates/cpp/client.pb.cc + ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/api/service_compiler/templates/cpp/client.pb.h + ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/api/service_compiler/templates/cpp/server.pb.cc + ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/api/service_compiler/templates/cpp/server.pb.h + ) + + set(_plugin_py ${CMAKE_CURRENT_SOURCE_DIR}/spark/api/service_compiler/plugin.py) + if(WIN32) + set(_plugin_cmd ${CMAKE_CURRENT_SOURCE_DIR}/spark/api/service_compiler/plugin.cmd) + set(_venv_activate_bat ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat) + add_custom_command( + OUTPUT + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.client.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.client.pb.h" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.server.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.server.pb.h" + COMMAND SET PYTHONPATH=${SPARK_PYTHON} + COMMAND ${_venv_activate_bat} + COMMAND + ${_ARGS_PROTOC} + ARGS + --cpp_out=${_ARGS_CXX_OUT_DIR} + --plugin=protoc-gen-service=${_plugin_cmd} + --service_out=lang=cpp:${_ARGS_CXX_OUT_DIR} + ${_proto_include_cli_args} + ${_abs_fil} + DEPENDS + ${_venv_activate_bat} + ${_ARGS_PROTOC} + ${_abs_fil} + ${_templates} + ${_plugin_cmd} + ${_plugin_py} + COMMENT "Running C++ service compiler on ${_fil}" + VERBATIM + ) + else() + set(_venv_exec ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh) + add_custom_command( + OUTPUT + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.client.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.client.pb.h" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.server.pb.cc" + "${_ARGS_CXX_OUT_DIR}/${_fil_we}.server.pb.h" + COMMAND ${_venv_exec} + ARGS + ${_ARGS_PROTOC} + --cpp_out=${_ARGS_CXX_OUT_DIR} + --plugin=protoc-gen-service=${_plugin_py} + --service_out=lang=cpp,make_file_name=${_abs_fil}:${_ARGS_CXX_OUT_DIR} + ${_proto_include_cli_args} + ${_abs_fil} + DEPENDS + ${_venv_exec} + ${_ARGS_PROTOC} + ${_abs_fil} + ${_templates} + ${_plugin_py} + COMMENT "Running C++ service compiler on ${_fil}" + VERBATIM + ) + endif() + endforeach() + + # remove some warnings from protobuf generated files + if(WIN32) + set_source_files_properties( + ${${_ARGS_CXX_SOURCES}} + PROPERTIES + COMPILE_FLAGS "/wd4309 /wd4838" + ) + else() + set_source_files_properties( + ${${_ARGS_CXX_SOURCES}} + PROPERTIES + COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized" + ) + endif() + + set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE) + set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE) +endfunction()