diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-08-12 01:36:19 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-08-12 01:36:21 +0200 |
| commit | 436acbb6300d9f4c68a9d42238c9d0e99f1aea8c (patch) | |
| tree | 7192cd3ba26509973f2c44b789867eb2c10893e2 | |
| parent | Merge pull request #1018 from Subv/ssy_sync (diff) | |
| download | yuzu-436acbb6300d9f4c68a9d42238c9d0e99f1aea8c.tar yuzu-436acbb6300d9f4c68a9d42238c9d0e99f1aea8c.tar.gz yuzu-436acbb6300d9f4c68a9d42238c9d0e99f1aea8c.tar.bz2 yuzu-436acbb6300d9f4c68a9d42238c9d0e99f1aea8c.tar.lz yuzu-436acbb6300d9f4c68a9d42238c9d0e99f1aea8c.tar.xz yuzu-436acbb6300d9f4c68a9d42238c9d0e99f1aea8c.tar.zst yuzu-436acbb6300d9f4c68a9d42238c9d0e99f1aea8c.zip | |
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3639b623c..2fb13c628 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -# CMake 3.6 required for FindBoost to define IMPORTED libs properly on unknown Boost versions -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.7) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules") include(DownloadExternals) @@ -187,7 +187,7 @@ find_package(Threads REQUIRED) if (ENABLE_SDL2) if (YUZU_USE_BUNDLED_SDL2) # Detect toolchain and platform - if (MSVC14 AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) set(SDL2_VER "SDL2-2.0.5") else() message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.") @@ -220,7 +220,7 @@ if (YUZU_USE_BUNDLED_UNICORN) if (MSVC) message(STATUS "unicorn not found, falling back to bundled") # Detect toolchain and platform - if (MSVC14 AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) set(UNICORN_VER "unicorn-yuzu") else() message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.") @@ -279,7 +279,7 @@ endif() if (ENABLE_QT) if (YUZU_USE_BUNDLED_QT) - if (MSVC14 AND ARCHITECTURE_x86_64) + if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) AND ARCHITECTURE_x86_64) set(QT_VER qt-5.10.0-msvc2015_64) else() message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.") |