diff options
| author | 2020-07-10 15:18:04 -0400 | |
|---|---|---|
| committer | 2020-07-10 15:18:04 -0400 | |
| commit | 995067538ddbee8761b8ddd6bf41b6f84c6ae524 (patch) | |
| tree | fbb70d1fab044444c7153d244e256525468bd2ea | |
| parent | Merge pull request #4287 from lioncash/fmt7 (diff) | |
| parent | cmake: stop linking against QGL after c6a0ab979239 (diff) | |
| download | yuzu-995067538ddbee8761b8ddd6bf41b6f84c6ae524.tar.gz yuzu-995067538ddbee8761b8ddd6bf41b6f84c6ae524.tar.xz yuzu-995067538ddbee8761b8ddd6bf41b6f84c6ae524.zip | |
Merge pull request #4221 from jbeich/unused-qt-opengl
cmake: drop dependency on QtOpenGL
Diffstat (limited to '')
| -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 dc6f3114f..1c0e49c03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -211,7 +211,7 @@ if(ENABLE_QT) | |||
| 211 | 211 | ||
| 212 | set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") | 212 | set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") |
| 213 | endif() | 213 | endif() |
| 214 | find_package(Qt5 5.9 COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT}) | 214 | find_package(Qt5 5.9 COMPONENTS Widgets ${QT_PREFIX_HINT}) |
| 215 | if (YUZU_USE_QT_WEB_ENGINE) | 215 | if (YUZU_USE_QT_WEB_ENGINE) |
| 216 | find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) | 216 | find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) |
| 217 | endif() | 217 | endif() |
| @@ -287,7 +287,7 @@ if (CONAN_REQUIRED_LIBS) | |||
| 287 | if(ENABLE_QT) | 287 | if(ENABLE_QT) |
| 288 | list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}") | 288 | list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}") |
| 289 | list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}") | 289 | list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}") |
| 290 | find_package(Qt5 5.9 REQUIRED COMPONENTS Widgets OpenGL) | 290 | find_package(Qt5 5.9 REQUIRED COMPONENTS Widgets) |
| 291 | if (YUZU_USE_QT_WEB_ENGINE) | 291 | if (YUZU_USE_QT_WEB_ENGINE) |
| 292 | find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets) | 292 | find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets) |
| 293 | endif() | 293 | 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 742b72856..6b25a7fa0 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt | |||
| @@ -152,7 +152,7 @@ endif() | |||
| 152 | create_target_directory_groups(yuzu) | 152 | create_target_directory_groups(yuzu) |
| 153 | 153 | ||
| 154 | target_link_libraries(yuzu PRIVATE common core input_common video_core) | 154 | target_link_libraries(yuzu PRIVATE common core input_common video_core) |
| 155 | target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets) | 155 | target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::Widgets) |
| 156 | target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) | 156 | target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) |
| 157 | 157 | ||
| 158 | if (ENABLE_VULKAN AND NOT WIN32) | 158 | if (ENABLE_VULKAN AND NOT WIN32) |