Browse Source
Merge pull request #4221 from jbeich/unused-qt-opengl
cmake: drop dependency on QtOpenGL
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
4 deletions
-
CMakeLists.txt
-
CMakeModules/CopyYuzuQt5Deps.cmake
-
src/yuzu/CMakeLists.txt
|
|
|
@ -211,7 +211,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() |
|
|
|
@ -287,7 +287,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() |
|
|
|
|
|
|
|
@ -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>.* |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
@ -152,7 +152,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) |
|
|
|
|
