Cmake/MSVC: Fix Qt6 discover for IDEs other than Visual Studio

CMakeSettings.json is a Visual Studio only extention to cmake that isn't supported anywhere else. Not even Visual Studio Code. So we set CMAKE_PREFIX_PATH inside DolphinQt's CMakeLists.txt instead.
mbc07 · Jan 31, 2023 · 1956ce1 · 1956ce1
1 parent 2843cd1
commit 1956ce1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git 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
@@ -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()