diff --git a/cmake/TargetCapnpSources.cmake b/cmake/TargetCapnpSources.cmake index 2334e260..9f17ba4b 100644 --- a/cmake/TargetCapnpSources.cmake +++ b/cmake/TargetCapnpSources.cmake @@ -78,11 +78,15 @@ function(target_capnp_sources target include_prefix) endif() get_property(mp_include_dir GLOBAL PROPERTY MP_INCLUDE_DIR) + set(mpgen_import_paths ${mp_include_dir}) + if(NOT mp_include_dir AND MPGEN_BINARY STREQUAL "Libmultiprocess::mpgen") + get_property(mpgen_import_paths TARGET Libmultiprocess::mpgen PROPERTY INTERFACE_INCLUDE_DIRECTORIES) + endif() set(generated_headers "") foreach(capnp_file IN LISTS TCS_UNPARSED_ARGUMENTS) add_custom_command( OUTPUT ${capnp_file}.c++ ${capnp_file}.h ${capnp_file}.proxy-client.c++ ${capnp_file}.proxy-types.h ${capnp_file}.proxy-server.c++ ${capnp_file}.proxy-types.c++ ${capnp_file}.proxy.h - COMMAND ${MPGEN_BINARY} ${CMAKE_CURRENT_SOURCE_DIR} ${include_prefix} ${CMAKE_CURRENT_SOURCE_DIR}/${capnp_file} ${TCS_IMPORT_PATHS} ${mp_include_dir} + COMMAND ${MPGEN_BINARY} ${CMAKE_CURRENT_SOURCE_DIR} ${include_prefix} ${CMAKE_CURRENT_SOURCE_DIR}/${capnp_file} ${TCS_IMPORT_PATHS} ${mpgen_import_paths} DEPENDS ${capnp_file} ${MPGEN_BINARY} VERBATIM )