Merge pull request #5198 from hesmar/hemsar/cmakeFixProtobufGenerate

Revert "protobuf_generate(): add relative path to output dir"
6 years ago · c7352b39f8
parent dc81f795c7 1509e8e3b3
commit c7352b39f8
1 changed files with 1 additions and 1 deletions
--- a/cmake/protobuf-config.cmake.in
+++ b/cmake/protobuf-config.cmake.in
@ -105,7 +105,7 @@ function(protobuf_generate)
    add_custom_command(
      OUTPUT ${_generated_srcs}
      COMMAND  protobuf::protoc
-      ARGS --${protobuf_generate_LANGUAGE}_out ${_dll_export_decl}${protobuf_generate_PROTOC_OUT_DIR}/${_rel_dir} ${_protobuf_include_path} ${_abs_file}
+      ARGS --${protobuf_generate_LANGUAGE}_out ${_dll_export_decl}${protobuf_generate_PROTOC_OUT_DIR} ${_protobuf_include_path} ${_abs_file}
      DEPENDS ${_abs_file} protobuf::protoc
      COMMENT "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}"
      VERBATIM )