diff --git a/externals b/externals index 2282ec752..b82477cb9 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 2282ec752b2fd06302d14d23957a3df0502ba21a +Subproject commit b82477cb948e88038dbdf787047db9265345014f diff --git a/tools/Protobuf.cmake b/tools/Protobuf.cmake index 58b287dcb..3baee3e8b 100644 --- a/tools/Protobuf.cmake +++ b/tools/Protobuf.cmake @@ -70,11 +70,31 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS) list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h") if (WIN32) - set(plugin_cmd plugin.cmd) - else() - set(plugin_cmd plugin.py) - endif() + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc" + "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h" + + COMMAND "SET PYTHONPATH=${SPARK_PYTHON}" + COMMAND ${Protobuf_PROTOC_EXECUTABLE} + + ARGS + --cpp_out=${CMAKE_BINARY_DIR}/src + --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd + --service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_BINARY_DIR}/src + -I ${PROTOBUF_INCLUDE_DIRS} + -I ${CMAKE_SOURCE_DIR}/src + ${ABS_FIL} + + DEPENDS ${ABS_FIL} + + COMMENT "Running C++ service compiler on ${FIL}" + VERBATIM ) + else() add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc" @@ -88,7 +108,7 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS) ARGS --cpp_out=${CMAKE_BINARY_DIR}/src - --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/${plugin_cmd} + --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py --service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_BINARY_DIR}/src -I ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src @@ -97,7 +117,10 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS) DEPENDS ${ABS_FIL} COMMENT "Running C++ service compiler on ${FIL}" - VERBATIM ) + VERBATIM ) + endif() + + endforeach() set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)