diff options
| author |  David | 2020-07-01 14:25:47 +1000 |
|---|---|---|
| committer |  GitHub | 2020-07-01 14:25:47 +1000 |
| commit | beb172e9fcd70f39da2c767730177b7dd456ba8a (patch) | |
| tree | 07b7050a0e59ceaf324b1ee5605e14622ae35620 | |
| parent | Merge pull request #3967 from FearlessTobi/keys-singleton (diff) | |
| parent | cmake: depend on WebEngine with system Qt (diff) | |
| download | yuzu-beb172e9fcd70f39da2c767730177b7dd456ba8a.tar.gz yuzu-beb172e9fcd70f39da2c767730177b7dd456ba8a.tar.xz yuzu-beb172e9fcd70f39da2c767730177b7dd456ba8a.zip | |
Merge pull request #4209 from jbeich/webengine
cmake: unbreak YUZU_USE_QT_WEB_ENGINE without YUZU_USE_BUNDLED_QT
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b71071271..73405ce4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -214,6 +214,9 @@ if(ENABLE_QT) | |||
| 214 | set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") | 214 | set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") |
| 215 | endif() | 215 | endif() |
| 216 | find_package(Qt5 5.9 COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT}) | 216 | find_package(Qt5 5.9 COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT}) |
| 217 | if (YUZU_USE_QT_WEB_ENGINE) | ||
| 218 | find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) | ||
| 219 | endif() | ||
| 217 | if (NOT Qt5_FOUND) | 220 | if (NOT Qt5_FOUND) |
| 218 | list(APPEND CONAN_REQUIRED_LIBS "qt/5.14.1@bincrafters/stable") | 221 | list(APPEND CONAN_REQUIRED_LIBS "qt/5.14.1@bincrafters/stable") |
| 219 | endif() | 222 | endif() |