Merge pull request #5198 from hesmar/hemsar/cmakeFixProtobufGenerate

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

Merge pull request #5198 from hesmar/hemsar/cmakeFixProtobufGenerate
Revert "protobuf_generate(): add relative path to output dir"
c7352b39 · Joshua Haberman · GitHub · dc81f795 · 1509e8e3 · c7352b39
Unverified Commit c7352b39 authored Oct 15, 2018 by Joshua Haberman Committed by GitHub Oct 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- 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 )