1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cross-compilation against sysroot with vulkan support

Browse Source 
Replace the use of the unqualified qvkgen target with the fully
qualified one, as we can be sure that that target exists during a host
build as well as when cross-compiling.

Change-Id: I31ce3d9f2fd629668a275da9114ab55339b82c31
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Simon Hausmann 2019-11-11 13:52:21 +01:00
parent 1b41a62893
commit 52345a1076
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/CMakeLists.txt
View File

@ -717,11 +717,6 @@ extend_target(Gui CONDITION QT_FEATURE_vulkan
# special case begin # special case begin
if (QT_FEATURE_vulkan) if (QT_FEATURE_vulkan)
set(qvkgen_command "${HOST_QVKGEN}")
if (TARGET qvkgen)
set(qvkgen_command qvkgen)
endif()
set(vulkan_fun "qvulkanfunctions.h") set(vulkan_fun "qvulkanfunctions.h")
set(vulkan_fun_p "qvulkanfunctions_p.h") set(vulkan_fun_p "qvulkanfunctions_p.h")
set(vulkan_fun_p_cpp "qvulkanfunctions_p.cpp") set(vulkan_fun_p_cpp "qvulkanfunctions_p.cpp")
@ -729,7 +724,7 @@ if (QT_FEATURE_vulkan)
add_custom_command( add_custom_command(
OUTPUT "vulkan/${vulkan_fun}" "vulkan/${vulkan_fun_p}" "vulkan/${vulkan_fun_p_cpp}" OUTPUT "vulkan/${vulkan_fun}" "vulkan/${vulkan_fun_p}" "vulkan/${vulkan_fun_p_cpp}"
COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vulkan/" COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vulkan/"
COMMAND "${qvkgen_command}" COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qvkgen
"${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk.xml" "${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk.xml"
"${PROJECT_SOURCE_DIR}/header.LGPL" "${PROJECT_SOURCE_DIR}/header.LGPL"
"${CMAKE_CURRENT_BINARY_DIR}/vulkan/qvulkanfunctions" "${CMAKE_CURRENT_BINARY_DIR}/vulkan/qvulkanfunctions"