diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-09 12:36:22 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-16 23:06:32 +0000 |
| commit | 305f63b707b81a75f595fb0ccbbf216b806f0b4b (patch) | |
| tree | c86c5d67fa4744109ffa80ab23afff5690e1f67b | |
| parent | 16dc61822e85d7254c4f26d046a5548aac9b0858 (diff) | |
Add missing dependency to the qvkgen tool when generating vulkan code
Fixes: QTBUG-100574
Change-Id: Ib68a3d77e5d3c9a9fc541a69a2748b94ade3ceef
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit fedd4f26ad9afb0f848ad12cf621e5a7a6208742)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/gui/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 1e212b25fc..e3062561df 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" ) |