Jelajahi Sumber

Revert "protobuf_generate(): add relative path to output dir"

This reverts commit 93f6b67eb217812266fb29a00977046789863aca.

Protoc adds already the relative path to the output directory.
Therefore, we have to remove this again from the output directory
to prevent adding it twice.
Markus Heß 7 tahun lalu
induk
melakukan
1509e8e3b3
1 mengubah file dengan 1 tambahan dan 1 penghapusan
  1. 1 1
      cmake/protobuf-config.cmake.in

+ 1 - 1
cmake/protobuf-config.cmake.in

@@ -105,7 +105,7 @@ function(protobuf_generate)
     add_custom_command(
     add_custom_command(
       OUTPUT ${_generated_srcs}
       OUTPUT ${_generated_srcs}
       COMMAND  protobuf::protoc
       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
       DEPENDS ${_abs_file} protobuf::protoc
       COMMENT "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}"
       COMMENT "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}"
       VERBATIM )
       VERBATIM )