octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4209 from jbeich/webengine 

cmake: unbreak YUZU_USE_QT_WEB_ENGINE without YUZU_USE_BUNDLED_QT
This commit is contained in:
David 2020-07-01 14:25:47 +10:00 committed by GitHub
parent 3bb63bc0b3 dda90ce1c2
commit beb172e9fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -214,6 +214,9 @@ if(ENABLE_QT)
set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") set(QT_PREFIX_HINT HINTS "${QT_PREFIX}")
endif() endif()
find_package(Qt5 5.9 COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT}) find_package(Qt5 5.9 COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT})
if (YUZU_USE_QT_WEB_ENGINE)
find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets)
endif()
if (NOT Qt5_FOUND) if (NOT Qt5_FOUND)
list(APPEND CONAN_REQUIRED_LIBS "qt/5.14.1@bincrafters/stable") list(APPEND CONAN_REQUIRED_LIBS "qt/5.14.1@bincrafters/stable")
endif() endif()