Browse Source
Merge pull request #8584 from Morph1984/qt5-cleanup
CMakeLists: Require QtConcurrent, and remove unused dlls
pull/15/merge
bunnei
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
10 deletions
-
CMakeLists.txt
-
CMakeModules/CopyYuzuQt5Deps.cmake
|
|
|
@ -300,12 +300,12 @@ if(ENABLE_QT) |
|
|
|
set(YUZU_QT_NO_CMAKE_SYSTEM_PATH "NO_CMAKE_SYSTEM_PATH") |
|
|
|
endif() |
|
|
|
if ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux") AND YUZU_USE_BUNDLED_QT) |
|
|
|
find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets DBus ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) |
|
|
|
find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets Concurrent DBus ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) |
|
|
|
else() |
|
|
|
find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) |
|
|
|
find_package(Qt5 ${QT_VERSION} REQUIRED COMPONENTS Widgets Concurrent ${QT_PREFIX_HINT} ${YUZU_QT_NO_CMAKE_SYSTEM_PATH}) |
|
|
|
endif() |
|
|
|
if (YUZU_USE_QT_WEB_ENGINE) |
|
|
|
find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) |
|
|
|
find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets) |
|
|
|
endif() |
|
|
|
|
|
|
|
if (ENABLE_QT_TRANSLATION) |
|
|
|
|
|
|
|
@ -19,9 +19,6 @@ function(copy_yuzu_Qt5_deps target_dir) |
|
|
|
set(IMAGEFORMATS ${DLL_DEST}plugins/imageformats/) |
|
|
|
if (MSVC) |
|
|
|
windows_copy_files(${target_dir} ${Qt5_DLL_DIR} ${DLL_DEST} |
|
|
|
icudt*.dll |
|
|
|
icuin*.dll |
|
|
|
icuuc*.dll |
|
|
|
Qt5Core$<$<CONFIG:Debug>:d>.* |
|
|
|
Qt5Gui$<$<CONFIG:Debug>:d>.* |
|
|
|
Qt5Widgets$<$<CONFIG:Debug>:d>.* |
|
|
|
@ -37,18 +34,17 @@ function(copy_yuzu_Qt5_deps target_dir) |
|
|
|
Qt5Quick$<$<CONFIG:Debug>:d>.* |
|
|
|
Qt5QuickWidgets$<$<CONFIG:Debug>:d>.* |
|
|
|
Qt5WebChannel$<$<CONFIG:Debug>:d>.* |
|
|
|
Qt5WebEngine$<$<CONFIG:Debug>:d>.* |
|
|
|
Qt5WebEngineCore$<$<CONFIG:Debug>:d>.* |
|
|
|
Qt5WebEngineWidgets$<$<CONFIG:Debug>:d>.* |
|
|
|
QtWebEngineProcess$<$<CONFIG:Debug>:d>.* |
|
|
|
) |
|
|
|
|
|
|
|
windows_copy_files(${target_dir} ${Qt5_RESOURCES_DIR} ${DLL_DEST} |
|
|
|
qtwebengine_resources.pak |
|
|
|
icudtl.dat |
|
|
|
qtwebengine_devtools_resources.pak |
|
|
|
qtwebengine_resources.pak |
|
|
|
qtwebengine_resources_100p.pak |
|
|
|
qtwebengine_resources_200p.pak |
|
|
|
icudtl.dat |
|
|
|
) |
|
|
|
endif () |
|
|
|
windows_copy_files(yuzu ${Qt5_PLATFORMS_DIR} ${PLATFORMS} qwindows$<$<CONFIG:Debug>:d>.*) |
|
|
|
|
