diff --git a/CMakePresets.json b/CMakePresets.json index 2aeb0f064..7d23903d6 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -25,18 +25,9 @@ { "name": "x64-Clang-Debug", "displayName": "Clang x64 Debug", - "generator": "Ninja", - "binaryDir": "${sourceDir}/Build/x64-Clang-Debug", + "inherits": ["x64-Clang-Base"], "cacheVariables": { - "CMAKE_C_COMPILER": "clang-cl", - "CMAKE_CXX_COMPILER": "clang-cl", - "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_INSTALL_PREFIX": "${sourceDir}/Install/x64-Clang-Debug" - }, - "vendor": { - "microsoft.com/VisualStudioSettings/CMake/1.0": { - "intelliSenseMode": "windows-clang-x64" - } + "CMAKE_BUILD_TYPE": "Debug" } }, { diff --git a/cmake/DetectQtInstallation.cmake b/cmake/DetectQtInstallation.cmake index d482ed9c7..e95e8980f 100644 --- a/cmake/DetectQtInstallation.cmake +++ b/cmake/DetectQtInstallation.cmake @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later -file(GLOB QT_KITS LIST_DIRECTORIES true "C:/Qt/*/msvc*") +file(GLOB QT_KITS LIST_DIRECTORIES true "C:/Qt/*/msvc*_64") list(SORT QT_KITS COMPARE NATURAL) list(REVERSE QT_KITS) if(QT_KITS) @@ -9,6 +9,6 @@ if(QT_KITS) set(CMAKE_PREFIX_PATH "${QT_PREFIX}" CACHE PATH "Qt prefix auto‑detected" FORCE) message(STATUS "Auto-detected Qt prefix: ${QT_PREFIX}") else() - message(WARNING "findQt.cmake: no Qt‑Directory found in C:/Qt – please set CMAKE_PREFIX_PATH manually") + message(STATUS "findQt.cmake: no Qt‑Directory found in C:/Qt – please set CMAKE_PREFIX_PATH manually") endif()