piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Scott Mansell 2023-01-29 21:03:34 +13:00
parent 2843cd10a8
commit 1956ce151f
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeSettings.json
View File

@ -9,10 +9,6 @@
"buildRoot": "${workspaceRoot}\\Build\\${name}", "buildRoot": "${workspaceRoot}\\Build\\${name}",
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"variables": [ "variables": [
{
"name": "CMAKE_PREFIX_PATH",
"value": "${workspaceRoot}\\Externals\\Qt\\Qt6.3.0\\x64"
}
] ]
}, },
{ {
@ -24,10 +20,6 @@
"buildRoot": "${workspaceRoot}\\Build\\${name}", "buildRoot": "${workspaceRoot}\\Build\\${name}",
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"variables": [ "variables": [
{
"name": "CMAKE_PREFIX_PATH",
"value": "${workspaceRoot}\\Externals\\Qt\\Qt6.3.0\\x64"
}
] ]
}, },
{ {
@ -39,10 +31,6 @@
"buildRoot": "${workspaceRoot}\\Build\\${name}", "buildRoot": "${workspaceRoot}\\Build\\${name}",
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"variables": [ "variables": [
{
"name": "CMAKE_PREFIX_PATH",
"value": "${workspaceRoot}\\Externals\\Qt\\Qt6.3.0\\ARM64"
},
{ {
"name": "CMAKE_SYSTEM_NAME", "name": "CMAKE_SYSTEM_NAME",
"value": "Windows" "value": "Windows"
@ -62,10 +50,6 @@
"buildRoot": "${workspaceRoot}\\Build\\${name}", "buildRoot": "${workspaceRoot}\\Build\\${name}",
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"variables": [ "variables": [
{
"name": "CMAKE_PREFIX_PATH",
"value": "${workspaceRoot}\\Externals\\Qt\\Qt6.3.0\\ARM64"
},
{ {
"name": "CMAKE_SYSTEM_NAME", "name": "CMAKE_SYSTEM_NAME",
"value": "Windows" "value": "Windows"

6
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -3,11 +3,11 @@ if(POLICY CMP0084)
cmake_policy(SET CMP0084 NEW) cmake_policy(SET CMP0084 NEW)
endif() endif()
if (NOT QT_DIR AND MSVC) if (MSVC)
if(_M_ARM_64) 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() 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()
endif() endif()