From 436acbb6300d9f4c68a9d42238c9d0e99f1aea8c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 11 Aug 2018 19:36:19 -0400 Subject: [PATCH 1/2] CMakeLists: Change MSVC14 variable to MSVC_VERSION Use of the MSVC14 variable is discouraged in the CMake documentation (which makes sense, since MSVC_VERSION is the more general appliable variable). --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3639b623c3..2fb13c628e 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.") From 3d486fffed1bfc1edbb7910591c2bbf6eca0a54f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 4 Aug 2018 17:20:10 -0400 Subject: [PATCH 2/2] CMakeLists: lowercase find_library usage The rest of the CMake script uses lowercase for commands (which is the general CMake style), making it more consistent with surrounding code. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fb13c628e..e7fea4fbff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)