mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-28 03:38:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'msvc-arm64-windows10'

Browse Source 
ea882b4aa9 MSVC: Fixed missing import library for Windows 10 ARM64 (Desktop)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4129
This commit is contained in:
Brad King
2019-12-11 15:30:31 +00:00
committed by Kitware Robot
parent a97aeb0f23 ea882b4aa9
commit 2a26a6de01
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Platform/Windows-MSVC.cmake
View File

@@ -217,7 +217,7 @@ elseif(WINDOWS_PHONE OR WINDOWS_STORE)
else()
set(_PLATFORM_DEFINES "/DWIN32")
if(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM64" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM64")
if(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")
elseif(MSVC_VERSION GREATER 1310)
if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*")