diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | CMakeModules/CopyYuzuQt5Deps.cmake | 1 | ||||
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 73405ce4b..2f1bc81ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -213,7 +213,7 @@ if(ENABLE_QT) | |||
| 213 | 213 | ||
| 214 | set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") | 214 | set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") |
| 215 | endif() | 215 | endif() |
| 216 | find_package(Qt5 5.9 COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT}) | 216 | find_package(Qt5 5.9 COMPONENTS Widgets ${QT_PREFIX_HINT}) |
| 217 | if (YUZU_USE_QT_WEB_ENGINE) | 217 | if (YUZU_USE_QT_WEB_ENGINE) |
| 218 | find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) | 218 | find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) |
| 219 | endif() | 219 | endif() |
| @@ -289,7 +289,7 @@ if (CONAN_REQUIRED_LIBS) | |||
| 289 | if(ENABLE_QT) | 289 | if(ENABLE_QT) |
| 290 | list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}") | 290 | list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}") |
| 291 | list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}") | 291 | list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}") |
| 292 | find_package(Qt5 5.9 REQUIRED COMPONENTS Widgets OpenGL) | 292 | find_package(Qt5 5.9 REQUIRED COMPONENTS Widgets) |
| 293 | if (YUZU_USE_QT_WEB_ENGINE) | 293 | if (YUZU_USE_QT_WEB_ENGINE) |
| 294 | find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets) | 294 | find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets) |
| 295 | endif() | 295 | endif() |
diff --git a/CMakeModules/CopyYuzuQt5Deps.cmake b/CMakeModules/CopyYuzuQt5Deps.cmake index 2598b9b60..59343b1ca 100644 --- a/CMakeModules/CopyYuzuQt5Deps.cmake +++ b/CMakeModules/CopyYuzuQt5Deps.cmake | |||
| @@ -15,7 +15,6 @@ function(copy_yuzu_Qt5_deps target_dir) | |||
| 15 | icuuc*.dll | 15 | icuuc*.dll |
| 16 | Qt5Core$<$<CONFIG:Debug>:d>.* | 16 | Qt5Core$<$<CONFIG:Debug>:d>.* |
| 17 | Qt5Gui$<$<CONFIG:Debug>:d>.* | 17 | Qt5Gui$<$<CONFIG:Debug>:d>.* |
| 18 | Qt5OpenGL$<$<CONFIG:Debug>:d>.* | ||
| 19 | Qt5Widgets$<$<CONFIG:Debug>:d>.* | 18 | Qt5Widgets$<$<CONFIG:Debug>:d>.* |
| 20 | ) | 19 | ) |
| 21 | 20 | ||
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 75c27e39e..c08a10f29 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt | |||
| @@ -147,7 +147,7 @@ endif() | |||
| 147 | create_target_directory_groups(yuzu) | 147 | create_target_directory_groups(yuzu) |
| 148 | 148 | ||
| 149 | target_link_libraries(yuzu PRIVATE common core input_common video_core) | 149 | target_link_libraries(yuzu PRIVATE common core input_common video_core) |
| 150 | target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets) | 150 | target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::Widgets) |
| 151 | target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) | 151 | target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) |
| 152 | 152 | ||
| 153 | if (ENABLE_VULKAN AND NOT WIN32) | 153 | if (ENABLE_VULKAN AND NOT WIN32) |