From 2a9ef0ecee3ca843aa3b3f1ddce1d47b8c6eb002 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 3 Sep 2020 12:04:54 +0200 Subject: CMake: Fix call to tracegen when cross-compiling tools We need to use the imported host tracegen target to generate files, not the one we're going to cross-build. This amends 5c092c2b401. Change-Id: Ib74dd2d87110383c31216872eb55bebf5d90df37 Reviewed-by: Samuli Piippo --- cmake/QtTargetHelpers.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'cmake/QtTargetHelpers.cmake') diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake index d7a8e3c86b..124e1c90d2 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake @@ -348,10 +348,18 @@ function(qt_create_tracepoints name tracepoints_file) set(tracegen_arg "etw") endif() - qt_get_tool_target_name(tracegen_target tracegen) + if(QT_HOST_PATH) + qt_path_join(tracegen + "${QT_HOST_PATH}" + "${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}" + "tracegen") + else() + set(tracegen "${QT_CMAKE_EXPORT_NAMESPACE}::tracegen") + endif() + get_filename_component(tracepoints_filepath "${tracepoints_file}" ABSOLUTE) add_custom_command(OUTPUT "${header_path}" - COMMAND ${tracegen_target} ${tracegen_arg} "${tracepoints_filepath}" "${header_path}" + COMMAND ${tracegen} ${tracegen_arg} "${tracepoints_filepath}" "${header_path}" VERBATIM) add_custom_target(${name}_tracepoints_header DEPENDS "${header_path}") add_dependencies(${name} ${name}_tracepoints_header) -- cgit v1.2.3