From aa5d2ae584a2652fa8bd6a28c9466e51e2c567e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Wed, 26 Apr 2023 22:40:15 +0200 Subject: [PATCH] Fix blake2 and argon2 building on Windows ARM (#4220) --- CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 924e899e..bbf67778 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -610,7 +610,7 @@ add_library( target_include_directories(cryptopp PUBLIC submodules) -if(WIN32 OR CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") set(ARGON_CORE submodules/phc-winner-argon2/src/opt.c) else() set(ARGON_CORE submodules/phc-winner-argon2/src/ref.c) @@ -639,14 +639,10 @@ if(WIN32) target_link_libraries(lmdb ntdll) endif() -if(WIN32) +if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") set(BLAKE2_IMPLEMENTATION "crypto/blake2/blake2b.c") else() - if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$") - set(BLAKE2_IMPLEMENTATION "crypto/blake2/blake2b.c") - else() - set(BLAKE2_IMPLEMENTATION "crypto/blake2/blake2b-ref.c") - endif() + set(BLAKE2_IMPLEMENTATION "crypto/blake2/blake2b-ref.c") endif() add_library(blake2 crypto/blake2/blake2-config.h crypto/blake2/blake2-impl.h