whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <alexandru.croitor@qt.io>
bb10
Alexey Edelev 2022-02-09 12:36:22 +01:00
parent eb628794c7
commit fedd4f26ad
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/CMakeLists.txt
View File

@ -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"
)