Ver código fonte

Merge pull request #5198 from hesmar/hemsar/cmakeFixProtobufGenerate

Revert "protobuf_generate(): add relative path to output dir"
Joshua Haberman 7 anos atrás
pai
commit
c7352b39f8
1 arquivos alterados com 1 adições e 1 exclusões
  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 )