diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2016-07-26 21:45:57 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2016-07-26 22:09:56 +0100 |
| commit | 8fa3a333671fd940c9557f39b9d4fdbaeee186fa (patch) | |
| tree | f7b3e08b62e837b18fb735a8867449dad3de9f1c /cmake | |
| parent | 20bea0a7e1f1b7d4afad7ecd24e8a5515db62ad5 (diff) | |
cmake: Require MSVC 2015.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindDirectX.cmake | 2 | ||||
| -rw-r--r-- | cmake/Windows10SDK.cmake | 53 |
2 files changed, 1 insertions, 54 deletions
diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake index 34dbdd8c..f4d9dddd 100644 --- a/cmake/FindDirectX.cmake +++ b/cmake/FindDirectX.cmake @@ -74,7 +74,7 @@ if (WIN32) # # See also: # - http://msdn.microsoft.com/en-us/library/windows/desktop/ee663275.aspx - if (DEFINED MSVC_VERSION AND NOT ${MSVC_VERSION} LESS 1700) + if (MSVC) set (USE_WINSDK_HEADERS TRUE) endif () diff --git a/cmake/Windows10SDK.cmake b/cmake/Windows10SDK.cmake deleted file mode 100644 index df189d5e..00000000 --- a/cmake/Windows10SDK.cmake +++ /dev/null @@ -1,53 +0,0 @@ -# - try to find and use Windows 10 SDK on VS 2013 -# -# VS 2013 will never pick Windows 10 SDK -- one must manually set the include and library directories. -# -# See also: -# - https://github.com/walbourn/directx-sdk-samples/commit/68575c40984f2581e3931157bd7e9f831ba70d69 -# - http://stackoverflow.com/a/28922582 -# - http://blogs.msdn.com/b/vcblog/archive/2012/11/23/using-the-windows-8-sdk-with-visual-studio-2010-configuring-multiple-projects.aspx - -if (MSVC AND ${MSVC_VERSION} LESS 1900 AND NOT CMAKE_GENERATOR_TOOLSET MATCHES "_xp$") - - include (FindPackageMessage) - - # Can't use "$ENV{ProgramFiles(x86)}" to avoid violating CMP0053. See - # http://public.kitware.com/pipermail/cmake-developers/2014-October/023190.html - set (ProgramFiles_x86 "ProgramFiles(x86)") - if ("$ENV{${ProgramFiles_x86}}") - set (ProgramFiles "$ENV{${ProgramFiles_x86}}") - else () - set (ProgramFiles "$ENV{ProgramFiles}") - endif () - - set (WIN10_SDK_VER "10.0.10240.0") - - find_path (WIN10_SDK_ROOT_DIR - SDKManifest.xml - PATHS - "${ProgramFiles}/Windows Kits/10" - DOC "Windows 10 SDK root directory" - ) - - if (CMAKE_SIZEOF_VOID_P EQUAL 4) - set (WIN10_SDK_ARCH x86) - else () - set (WIN10_SDK_ARCH x64) - endif () - - if (WIN10_SDK_ROOT_DIR) - find_package_message (WIN10_SDK "Windows 10 SDK - found: ${WIN10_SDK_ROOT_DIR}" "[${WIN10_SDK_ROOT_DIR}]") - set (WIN10_SDK_INC_DIRS - "${WIN10_SDK_ROOT_DIR}/Include/${WIN10_SDK_VER}/um" - "${WIN10_SDK_ROOT_DIR}/Include/${WIN10_SDK_VER}/shared" - "${WIN10_SDK_ROOT_DIR}/Include/${WIN10_SDK_VER}/winrt" - ) - include_directories (BEFORE ${WIN10_SDK_INC_DIRS}) - list (APPEND CMAKE_REQUIRED_INCLUDES ${WIN10_SDK_INC_DIRS}) - link_directories ( - ${WIN10_SDK_ROOT_DIR}/Lib/${WIN10_SDK_VER}/${WIN10_SDK_ARCH} - ) - else () - find_package_message (WIN10_SDK "Windows 10 SDK - not found" "[]") - endif () -endif () |