aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Steffen Wittmeier <steffen.wittmeier@rohde-schwarz.com>2018-06-25 11:29:56 +0200
committerGravatar Steffen Wittmeier <steffen.wittmeier@rohde-schwarz.com>2018-06-25 11:29:56 +0200
commit3e84147d53bea86f9e0e88c642f7af4b00365621 (patch)
tree90ffc666a2427985ca50b5f187111df6a65f892a
parentfc243c15fb0a691d3fc0896803939c2a535b6a8c (diff)
Fixed protobuf_generate output definition for files relative to the protobuf_generate command
-rw-r--r--cmake/protobuf-config.cmake.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/protobuf-config.cmake.in b/cmake/protobuf-config.cmake.in
index 3480c17c..18054687 100644
--- a/cmake/protobuf-config.cmake.in
+++ b/cmake/protobuf-config.cmake.in
@@ -92,11 +92,13 @@ function(protobuf_generate)
set(_generated_srcs_all)
foreach(_proto ${protobuf_generate_PROTOS})
get_filename_component(_abs_file ${_proto} ABSOLUTE)
+ get_filename_component(_abs_dir ${_abs_file} DIRECTORY)
get_filename_component(_basename ${_proto} NAME_WE)
+ file(RELATIVE_PATH _rel_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_abs_dir})
set(_generated_srcs)
foreach(_ext ${protobuf_generate_GENERATE_EXTENSIONS})
- list(APPEND _generated_srcs "${protobuf_generate_PROTOC_OUT_DIR}/${_basename}${_ext}")
+ list(APPEND _generated_srcs "${protobuf_generate_PROTOC_OUT_DIR}/${_rel_dir}/${_basename}${_ext}")
endforeach()
list(APPEND _generated_srcs_all ${_generated_srcs})