diff --git a/cmake/Protobuf.cmake b/cmake/Protobuf.cmake index 4ce664e6d..c99c2dd71 100644 --- a/cmake/Protobuf.cmake +++ b/cmake/Protobuf.cmake @@ -29,36 +29,43 @@ function(Protobuf_Generate_Cpp) 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" + 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} + ${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) + VERBATIM + ) endforeach() - set_source_files_properties(${${_ARGS_CXX_SOURCES}} ${${_ARGS_CXX_HEADERS}} PROPERTIES GENERATED TRUE) + 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") + 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" + 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) + set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE) + set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE) endfunction() function(Service_Compiler_Generate_Cpp) @@ -92,40 +99,51 @@ function(Service_Compiler_Generate_Cpp) 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 + ${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" + 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} + ${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) + 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" + 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} @@ -133,32 +151,32 @@ function(Service_Compiler_Generate_Cpp) --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} + DEPENDS + ${ABS_FIL} + ${TEMPLATES} + ${_plugin_py} COMMENT "Running C++ service compiler on ${FIL}" - VERBATIM) + VERBATIM + ) endif() - endforeach() # remove some warnings from protobuf generated files if(WIN32) - set_source_files_properties(${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS - "/wd4309 /wd4838") + 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" + 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) - + set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE) + set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE) endfunction()