From a9312c837e91006033bb045da65673cfdce4a58d Mon Sep 17 00:00:00 2001 From: Lucas Clemente Vella Date: Sat, 23 Mar 2024 11:37:50 +0000 Subject: [PATCH] Searching for Vulkan before QT6, so it doesn't messes with Vulkan. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b4df91028..6fec995c6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -374,6 +374,9 @@ if(ENABLE_QT6 AND Qt6_LOCATION) list(APPEND CMAKE_PREFIX_PATH "${Qt6_LOCATION}") endif() +# QT6 searches for Vulkan::Headers, too, so we have to define it before QT6 has a chance to do it. +add_subdirectory(externals) + function(set_suyu_qt_components) # Best practice is to ask for all components at once, so they are from the same version set(SUYU_QT_COMPONENTS2 Core Widgets Concurrent) @@ -709,7 +712,6 @@ if (SUYU_USE_FASTER_LD AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") endif() endif() -add_subdirectory(externals) add_subdirectory(src) # Set suyu project or suyu-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not