From fedd4f26ad9afb0f848ad12cf621e5a7a6208742 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 9 Feb 2022 12:36:22 +0100 Subject: [PATCH] Add missing dependency to the qvkgen tool when generating vulkan code Pick-to: 6.3 6.2 Fixes: QTBUG-100574 Change-Id: Ib68a3d77e5d3c9a9fc541a69a2748b94ade3ceef Reviewed-by: Alexandru Croitor --- src/gui/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index c8a6dadd9f..9e045be4aa 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -883,10 +883,14 @@ if (QT_FEATURE_vulkan) list(APPEND vulkan_fun_outputs "vulkan/${vulkan_fun_p_cpp}") if(NOT "${QT_HOST_PATH}" STREQUAL "") + set(host_executable_suffix "") + if(CMAKE_HOST_WIN32) + set(host_executable_suffix ".exe") + endif() qt_path_join(qvkgen "${QT_HOST_PATH}" "${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_LIBEXECDIR}" - "qvkgen") + "qvkgen${host_executable_suffix}") else() set(qvkgen "${QT_CMAKE_EXPORT_NAMESPACE}::qvkgen") endif() @@ -896,7 +900,7 @@ if (QT_FEATURE_vulkan) "${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk.xml" "${CMAKE_CURRENT_SOURCE_DIR}/vulkan/generated_header.txt" "${CMAKE_CURRENT_BINARY_DIR}/vulkan/qvulkanfunctions" - DEPENDS vulkan/vk.xml + DEPENDS vulkan/vk.xml ${qvkgen} COMMENT "Generating vulkan data" )