diff options
| author | André Apitzsch <andre.apitzsch@etit.tu-chemnitz.de> | 2018-07-13 11:08:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-07-16 12:59:36 (GMT) |
| commit | 71d99e156badae2e12eca56b2b2fa4059cf67cf9 (patch) | |
| tree | 03207976af1c93e4d452d25f01acbab58081efb1 /Modules/FindProtobuf.cmake | |
| parent | 2ae2d0bd3e01e6f8f02281d00a1df87f209fa6b5 (diff) | |
| download | CMake-71d99e156badae2e12eca56b2b2fa4059cf67cf9.zip CMake-71d99e156badae2e12eca56b2b2fa4059cf67cf9.tar.gz CMake-71d99e156badae2e12eca56b2b2fa4059cf67cf9.tar.bz2 | |
Protobuf: restore previous output directory
The protobuf upstream implementation has a different default output
directory. Restore our original output directory for compatibility.
Diffstat (limited to 'Modules/FindProtobuf.cmake')
| -rw-r--r-- | Modules/FindProtobuf.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake index b02bc20..d6d1ec6 100644 --- a/Modules/FindProtobuf.cmake +++ b/Modules/FindProtobuf.cmake @@ -210,7 +210,7 @@ function(protobuf_generate) set(_generated_srcs) foreach(_ext ${protobuf_generate_GENERATE_EXTENSIONS}) - list(APPEND _generated_srcs "${protobuf_generate_PROTOC_OUT_DIR}/${_rel_dir}/${_basename}${_ext}") + list(APPEND _generated_srcs "${protobuf_generate_PROTOC_OUT_DIR}/${_basename}${_ext}") endforeach() if(protobuf_generate_DESCRIPTORS AND protobuf_generate_LANGUAGE STREQUAL cpp) @@ -223,7 +223,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} ${_dll_desc_out} ${_protobuf_include_path} ${_abs_file} + ARGS --${protobuf_generate_LANGUAGE}_out ${_dll_export_decl}${protobuf_generate_PROTOC_OUT_DIR} ${_dll_desc_out} ${_protobuf_include_path} ${_abs_file} DEPENDS ${_abs_file} protobuf::protoc COMMENT "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}" VERBATIM ) |