diff options
| author |  bunnei | 2018-04-02 16:06:58 -0400 |
|---|---|---|
| committer |  GitHub | 2018-04-02 16:06:58 -0400 |
| commit | 2863e1edb9b53127a7ee365d104b1ff40fed9cf9 (patch) | |
| tree | 2b6706fcd92b0102cee0a4baed6948d628a5098a | |
| parent | Merge pull request #297 from bunnei/hid-touch-state (diff) | |
| parent | Update qt (diff) | |
| download | yuzu-2863e1edb9b53127a7ee365d104b1ff40fed9cf9.tar.gz yuzu-2863e1edb9b53127a7ee365d104b1ff40fed9cf9.tar.xz yuzu-2863e1edb9b53127a7ee365d104b1ff40fed9cf9.zip | |
Merge pull request #66 from RiverCityRansomware/qtUpdate
Updates CMakeLists to use Qt 5.10.0 instead of Qt 5.7
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bcd169643..86d2423ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -278,7 +278,7 @@ endif() | |||
| 278 | if (ENABLE_QT) | 278 | if (ENABLE_QT) |
| 279 | if (YUZU_USE_BUNDLED_QT) | 279 | if (YUZU_USE_BUNDLED_QT) |
| 280 | if (MSVC14 AND ARCHITECTURE_x86_64) | 280 | if (MSVC14 AND ARCHITECTURE_x86_64) |
| 281 | set(QT_VER qt-5.7-msvc2015_64) | 281 | set(QT_VER qt-5.10.0-msvc2015_64) |
| 282 | else() | 282 | else() |
| 283 | message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") | 283 | message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") |
| 284 | endif() | 284 | endif() |