diff options
| author | Tatsuro Shibamura <me@shibayan.jp> | 2020-01-23 05:44:54 +0900 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-22 12:44:54 -0800 |
| commit | 11b8872c973d02148e614a4b6ab0ec26ad239c7e (patch) | |
| tree | a650dc526961b9dbf692b3a8d7f7d204ef490526 | |
| parent | 2204efd414d1df30d861d19cf52f20e04d299c15 (diff) | |
| download | vcpkg-11b8872c973d02148e614a4b6ab0ec26ad239c7e.tar.gz vcpkg-11b8872c973d02148e614a4b6ab0ec26ad239c7e.zip | |
[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
| -rw-r--r-- | ports/cryptopp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cryptopp/portfile.cmake | 6 | ||||
| -rw-r--r-- | 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
|