summaryrefslogtreecommitdiff
path: root/cmake/os
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2021-06-06 22:22:03 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2021-06-07 23:15:36 +0200
commit5ba4c4200ce1f9bce8c2fc1de5d97a131d3c2f37 (patch)
treee66b282a70dc2ae6ec3b376543dcd95dbfdf3fe4 /cmake/os
parent233590a48d78fb1c7e320c7131c4543c10a4face (diff)
downloadmariadb-git-5ba4c4200ce1f9bce8c2fc1de5d97a131d3c2f37.tar.gz
MDEV-25870 Windows - fix ARM64 cross-compilation
Diffstat (limited to 'cmake/os')
-rw-r--r--cmake/os/Windows.cmake8
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index 73463ef2833..232560ff7b1 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -24,6 +24,14 @@ INCLUDE (CheckCSourceRuns)
INCLUDE (CheckSymbolExists)
INCLUDE (CheckTypeSize)
+IF(MSVC)
+ IF(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL ARM64)
+ SET(MSVC_ARM64 1)
+ SET(MSVC_INTEL 0)
+ ELSE()
+ SET(MSVC_INTEL 1)
+ ENDIF()
+ENDIF()
# avoid running system checks by using pre-cached check results
# system checks are expensive on VS since every tiny program is to be compiled in