diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-12 07:18:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-12 07:18:32 +0200 |
| commit | cb3c50eacc9f17c3bd3b5e42e78e4528e951e2d0 (patch) | |
| tree | 3c6334c49de7044b27bf4e1d4805e80ae4b94ab1 | |
| parent | Merge pull request #1026 from ogniK5377/retro-city-rampage (diff) | |
| parent | CMakeLists: lowercase find_library usage (diff) | |
| download | yuzu-cb3c50eacc9f17c3bd3b5e42e78e4528e951e2d0.tar yuzu-cb3c50eacc9f17c3bd3b5e42e78e4528e951e2d0.tar.gz yuzu-cb3c50eacc9f17c3bd3b5e42e78e4528e951e2d0.tar.bz2 yuzu-cb3c50eacc9f17c3bd3b5e42e78e4528e951e2d0.tar.lz yuzu-cb3c50eacc9f17c3bd3b5e42e78e4528e951e2d0.tar.xz yuzu-cb3c50eacc9f17c3bd3b5e42e78e4528e951e2d0.tar.zst yuzu-cb3c50eacc9f17c3bd3b5e42e78e4528e951e2d0.zip | |
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3639b623c..e7fea4fbf 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.") @@ -303,7 +303,7 @@ endif() # ====================================== IF (APPLE) - FIND_LIBRARY(COCOA_LIBRARY Cocoa) # Umbrella framework for everything GUI-related + find_library(COCOA_LIBRARY Cocoa) # Umbrella framework for everything GUI-related set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY}) if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) |