diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-11 15:30:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-11 15:31:23 (GMT) |
| commit | 2a26a6de012ff12c343456abc2236e60e95e15c5 (patch) | |
| tree | 21159bbb9e38f6d52a917d247d2e10fbb621ddcb | |
| parent | a97aeb0f238b7d03217f8e1b59edfd8cd25e59cf (diff) | |
| parent | ea882b4aa9e199a312c656d050710fd9a405cfdd (diff) | |
| download | CMake-2a26a6de012ff12c343456abc2236e60e95e15c5.zip CMake-2a26a6de012ff12c343456abc2236e60e95e15c5.tar.gz CMake-2a26a6de012ff12c343456abc2236e60e95e15c5.tar.bz2 | |
Merge topic 'msvc-arm64-windows10'
ea882b4aa9 MSVC: Fixed missing import library for Windows 10 ARM64 (Desktop)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4129
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 34f5d03..e1d6733 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -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_.*") |