diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-07-02 00:00:47 +0200 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-07-02 00:11:39 +0200 |
| commit | b1b1ed7597cbe329e26db8240b9e05d3fc360b6f (patch) | |
| tree | cd859de22e1085b8f6e50726d49b619204467359 | |
| parent | Merge pull request #4217 from lioncash/prototype (diff) | |
| download | yuzu-b1b1ed7597cbe329e26db8240b9e05d3fc360b6f.tar yuzu-b1b1ed7597cbe329e26db8240b9e05d3fc360b6f.tar.gz yuzu-b1b1ed7597cbe329e26db8240b9e05d3fc360b6f.tar.bz2 yuzu-b1b1ed7597cbe329e26db8240b9e05d3fc360b6f.tar.lz yuzu-b1b1ed7597cbe329e26db8240b9e05d3fc360b6f.tar.xz yuzu-b1b1ed7597cbe329e26db8240b9e05d3fc360b6f.tar.zst yuzu-b1b1ed7597cbe329e26db8240b9e05d3fc360b6f.zip | |
| -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) set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") endif() - find_package(Qt5 5.9 COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT}) + find_package(Qt5 5.9 COMPONENTS Widgets ${QT_PREFIX_HINT}) if (YUZU_USE_QT_WEB_ENGINE) find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) endif() @@ -289,7 +289,7 @@ if (CONAN_REQUIRED_LIBS) if(ENABLE_QT) list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}") list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}") - find_package(Qt5 5.9 REQUIRED COMPONENTS Widgets OpenGL) + find_package(Qt5 5.9 REQUIRED COMPONENTS Widgets) if (YUZU_USE_QT_WEB_ENGINE) find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets) 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) icuuc*.dll Qt5Core$<$<CONFIG:Debug>:d>.* Qt5Gui$<$<CONFIG:Debug>:d>.* - Qt5OpenGL$<$<CONFIG:Debug>:d>.* Qt5Widgets$<$<CONFIG:Debug>:d>.* ) 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() create_target_directory_groups(yuzu) target_link_libraries(yuzu PRIVATE common core input_common video_core) -target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets) +target_link_libraries(yuzu PRIVATE Boost::boost glad Qt5::Widgets) target_link_libraries(yuzu PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) if (ENABLE_VULKAN AND NOT WIN32) |