diff --git a/CMakeSettings.json b/CMakeSettings.json index 491c378ec8..72ac09bacc 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -9,10 +9,6 @@ "buildRoot": "${workspaceRoot}\\Build\\${name}", "cmakeCommandArgs": "", "variables": [ - { - "name": "CMAKE_PREFIX_PATH", - "value": "${workspaceRoot}\\Externals\\Qt\\Qt6.3.0\\x64" - } ] }, { @@ -24,10 +20,6 @@ "buildRoot": "${workspaceRoot}\\Build\\${name}", "cmakeCommandArgs": "", "variables": [ - { - "name": "CMAKE_PREFIX_PATH", - "value": "${workspaceRoot}\\Externals\\Qt\\Qt6.3.0\\x64" - } ] }, { @@ -39,10 +31,6 @@ "buildRoot": "${workspaceRoot}\\Build\\${name}", "cmakeCommandArgs": "", "variables": [ - { - "name": "CMAKE_PREFIX_PATH", - "value": "${workspaceRoot}\\Externals\\Qt\\Qt6.3.0\\ARM64" - }, { "name": "CMAKE_SYSTEM_NAME", "value": "Windows" @@ -62,10 +50,6 @@ "buildRoot": "${workspaceRoot}\\Build\\${name}", "cmakeCommandArgs": "", "variables": [ - { - "name": "CMAKE_PREFIX_PATH", - "value": "${workspaceRoot}\\Externals\\Qt\\Qt6.3.0\\ARM64" - }, { "name": "CMAKE_SYSTEM_NAME", "value": "Windows" diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index a9e07afe0b..a5463c8c27 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -3,11 +3,11 @@ if(POLICY CMP0084) cmake_policy(SET CMP0084 NEW) endif() -if (NOT QT_DIR AND MSVC) +if (MSVC) if(_M_ARM_64) - set(QT_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.3.0/ARM64/lib/cmake/Qt6") + list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.3.0/ARM64") else() - set(QT_DIR "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.3.0/x64/lib/cmake/Qt6") + list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.3.0/x64") endif() endif()