From 11b8872c973d02148e614a4b6ab0ec26ad239c7e Mon Sep 17 00:00:00 2001 From: Tatsuro Shibamura Date: Thu, 23 Jan 2020 05:44:54 +0900 Subject: [PATCH] [cryptopp] Fixed build error on ARM32/ARM64 Windows (#9633) * [cryptopp] Fixed build error on ARM64 Windows * [cryptopp] Update ci.baseline.txt * Update version * Use VCPKG_TARGET_IS_OSX variable --- ports/cryptopp/CONTROL | 2 +- ports/cryptopp/portfile.cmake | 6 ++++-- scripts/ci.baseline.txt | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL index 23a7bb456..9c11e1906 100644 --- a/ports/cryptopp/CONTROL +++ b/ports/cryptopp/CONTROL @@ -1,4 +1,4 @@ Source: cryptopp -Version: 8.2.0 +Version: 8.2.0-1 Homepage: https://github.com/weidai11/cryptopp Description: Crypto++ is a free C++ class library of cryptographic schemes. diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index d744deccd..36c747884 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -24,8 +24,10 @@ vcpkg_from_github( file(COPY ${CMAKE_SOURCE_PATH}/cryptopp-config.cmake DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -# disable assembly on OSX to fix broken build -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") +# disable assembly on OSX and ARM Windows to fix broken build +if (VCPKG_TARGET_IS_OSX) + set(CRYPTOPP_DISABLE_ASM "ON") +elseif (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") set(CRYPTOPP_DISABLE_ASM "ON") else() set(CRYPTOPP_DISABLE_ASM "OFF") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 85e9d353b..098c50c68 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -294,8 +294,6 @@ cpuinfo:arm64-windows=ignore crfsuite:arm-uwp=fail crfsuite:x64-uwp=fail crossguid:x64-osx=fail -cryptopp:arm64-windows=fail -cryptopp:arm-uwp=fail cspice:arm-uwp=fail cspice:x64-uwp=fail ctemplate:arm64-windows=fail