Skip to content

Commit d1ed40b

Browse files
authored
Fix target detection for Windows ARM64EC (#105)
1 parent 985271c commit d1ed40b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cmake/TargetArch.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ set(archdetect_c_code
1010
/*
1111
ARM family, known revisions: V5, V6, V7, V8
1212
*/
13-
#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(_M_ARM64) || defined(__aarch64__) || defined(__ARM64__)
14-
# if defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
13+
#if defined(__arm__) || defined(__TARGET_ARCH_ARM) || defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC) || defined(__aarch64__) || defined(__ARM64__)
14+
# if defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
1515
# error cmake_ARCH arm64
1616
# else
1717
# error cmake_ARCH arm

cryptopp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ endif()
743743
# Aach32 and Aarch64 #####
744744
# ##############################################################################
745745

746-
if(CRYPTOPP_ARMV8)
746+
if(CRYPTOPP_ARMV8 AND NOT MSVC)
747747
check_compile_link_option(
748748
"-DCRYPTOPP_ARM_NEON_HEADER=1" CRYPTOPP_ARM_NEON_HEADER
749749
"${TEST_PROG_DIR}/test_arm_neon_header.cpp"

0 commit comments

Comments
 (0)