diff options
author | Kyle Kienapfel <[email protected]> | 2022-10-17 16:55:40 -0700 |
---|---|---|
committer | Kyle Kienapfel <[email protected]> | 2022-11-24 06:28:42 -0800 |
commit | a75542ad2dd028f9aa3adfb00e92817ada12ccd8 (patch) | |
tree | 1ee95f8a10eb450aebd88c8940f1ea371bf226af /CMakeModules/CopyYuzuQt5Deps.cmake | |
parent | d23a35dfbd9d0edd5fcf8802eedf1910792f0c7a (diff) | |
download | yuzu-mainline-a75542ad2dd028f9aa3adfb00e92817ada12ccd8.tar.gz yuzu-mainline-a75542ad2dd028f9aa3adfb00e92817ada12ccd8.zip |
CMake: rework for Qt6 support
This PR rearranges things in the CMake system to make compiling with Qt6 possible
1. Camera API has changed in Qt6, so the camera feature is disabled
2. A previous fix involving QLocale is now version gated.
3. QRegExp replaced with QRegularExpression, see #5343
4. Qt6_LOCATION option added to specify a location to search for Qt6
(see examples below)
5. windeployqt is used to copy Qt6 files into the build directory on Windows
Notes for Arch Linux
Arch install happened to have qt6-base qt6-declarative qt6-translations installed
mkdir build && cd build
cmake .. -GNinja -DYUZU_USE_BUNDLED_VCPKG=ON -DYUZU_TESTS=OFF -DENABLE_QT6=YES -DYUZU_USE_BUNDLED_QT=NO
Windows (MSVC)
Qt wants users to download precompiled libraries via an online installer,
it is worth noting that the GPL/LGPL takes precendence over any ...
In the Qt Maintenance tool, under a version, such as 6.3.1
Select "MSVC 2019 64-bit"
Under Additional Libraries Qt Multimedia may be of use for Camera support
For the Web Applet I had to select the following:
PDF Positioning WebChannel WebEngine
mkdir build && cd build
cmake -G "Visual Studio 16 2019" -DQt6_LOCATION=C:/Qt/6.4.0/msvc2019_64/ \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=YES -DYUZU_USE_BUNDLED_QT=NO \
-DENABLE_QT_TRANSLATION=YES -DENABLE_QT6=YES ..
Some numbers for reference (msvc2019_64)
Qt5 (slimmed down) 508 MB
Qt5.15.2 all in 929 MB
Qt6.3.1 1.71 GB
Qt6.3.2 1.73 GB
Qt6.4.0-beta3 1.83 GB
Qt6.4.0 1.67 GB
Diffstat (limited to 'CMakeModules/CopyYuzuQt5Deps.cmake')
-rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index a353ddbb7..ab56de444 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake @@ -27,10 +27,13 @@ function(copy_yuzu_Qt5_deps target_dir) Qt5Core$<$<CONFIG:Debug>:d>.* Qt5Gui$<$<CONFIG:Debug>:d>.* Qt5Widgets$<$<CONFIG:Debug>:d>.* - Qt5Multimedia$<$<CONFIG:Debug>:d>.* Qt5Network$<$<CONFIG:Debug>:d>.* ) - + if (YUZU_USE_QT_MULTIMEDIA) + windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} + Qt5Multimedia$<$<CONFIG:Debug>:d>.* + ) + endif() if (YUZU_USE_QT_WEB_ENGINE) windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} Qt5Network$<$<CONFIG:Debug>:d>.* |