mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 09:29:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[cryptopp] Fixed build error on ARM32/ARM64 Windows (#9633)

Browse Source 
* [cryptopp] Fixed build error on ARM64 Windows

* [cryptopp] Update ci.baseline.txt

* Update version

* Use VCPKG_TARGET_IS_OSX variable
This commit is contained in:
Tatsuro Shibamura 2020-01-23 05:44:54 +09:00 committed by Victor Romero
parent 2204efd414
commit 11b8872c97
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/cryptopp/CONTROL
View File

@ -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.

6
ports/cryptopp/portfile.cmake
View File

@ -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")

2
scripts/ci.baseline.txt
View File

@ -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