From 88edf9d62cb2c692b5b9e1439c28e2b9b19d4670 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sat, 11 Jul 2020 19:06:31 +0200 Subject: [PATCH] cmake: stop linking against QGL Co-Authored-By: Jan Beich --- CMakeLists.txt | 2 +- CMakeModules/CopyCitraQt5Deps.cmake | 1 - src/citra_qt/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 927e77dfe0..e5bfecd5e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,7 +186,7 @@ if (ENABLE_QT) set(QT_PREFIX_HINT) endif() - find_package(Qt5 REQUIRED COMPONENTS Widgets OpenGL Multimedia ${QT_PREFIX_HINT}) + find_package(Qt5 REQUIRED COMPONENTS Widgets Multimedia ${QT_PREFIX_HINT}) if (ENABLE_QT_TRANSLATION) find_package(Qt5 REQUIRED COMPONENTS LinguistTools ${QT_PREFIX_HINT}) diff --git a/CMakeModules/CopyCitraQt5Deps.cmake b/CMakeModules/CopyCitraQt5Deps.cmake index d9014354ec..48bb940551 100644 --- a/CMakeModules/CopyCitraQt5Deps.cmake +++ b/CMakeModules/CopyCitraQt5Deps.cmake @@ -16,7 +16,6 @@ function(copy_citra_Qt5_deps target_dir) icuuc*.dll Qt5Core$<$:d>.* Qt5Gui$<$:d>.* - Qt5OpenGL$<$:d>.* Qt5Widgets$<$:d>.* Qt5Multimedia$<$:d>.* Qt5Network$<$:d>.* diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index eea517bc60..9d1fba4751 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -246,7 +246,7 @@ endif() create_target_directory_groups(citra-qt) target_link_libraries(citra-qt PRIVATE audio_core common core input_common network video_core) -target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::OpenGL Qt5::Widgets Qt5::Multimedia) +target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::Widgets Qt5::Multimedia) target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) target_compile_definitions(citra-qt PRIVATE