diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-07-07 14:34:30 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-07-14 10:25:47 +0200 |
| commit | 97741a959026816071e8c6a4ac8e0a660aa08454 (patch) | |
| tree | 1b43f0c222bc53c4a0b294ffa8166d42ff2937d3 /src/gui/CMakeLists.txt | |
| parent | a158dc2e76062e5cc7fced490926db9d25c697df (diff) | |
CMake: Fix call to qvkgen for cross-builds with tools
We must not call the qvkgen tool that was built for the target but the
one that's located in QT_HOST_PATH.
Change-Id: I6d23a8e3abd84d449517630f3b9f0d50e333c327
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui/CMakeLists.txt')
| -rw-r--r-- | src/gui/CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 7d78ecb282..4069a0bb97 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -858,8 +858,17 @@ if (QT_FEATURE_vulkan) set(vulkan_fun_p_cpp "qvulkanfunctions_p.cpp") list(APPEND vulkan_fun_outputs "vulkan/${vulkan_fun_p_cpp}") + if(QT_HOST_PATH) + qt_path_join(qvkgen + "${QT_HOST_PATH}" + "${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}" + "qvkgen") + else() + set(qvkgen "${QT_CMAKE_EXPORT_NAMESPACE}::qvkgen") + endif() + list(APPEND vulkan_fun_command_content - COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::qvkgen + COMMAND "${qvkgen}" "${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk.xml" "${PROJECT_SOURCE_DIR}/header.LGPL" "${CMAKE_CURRENT_BINARY_DIR}/vulkan/qvulkanfunctions" |