Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Jan 22, 2020
Merged

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

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d7b448
[cryptopp] Fixed build error on ARM64 Windows
shibayan Jan 11, 2020
06c70a6
[cryptopp] Update ci.baseline.txt
shibayan Jan 11, 2020
d22704a
Update version
shibayan Jan 16, 2020
7ae0860
Merge branch 'master' into fix-cryptopp-arm64
shibayan Jan 16, 2020
b46046b
Merge branch 'master' into fix-cryptopp-arm64
shibayan Jan 17, 2020
65b579d
Use VCPKG_TARGET_IS_OSX variable
shibayan Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/cryptopp/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
4 changes: 3 additions & 1 deletion ports/cryptopp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ 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
# disable assembly on OSX and ARM Windows to fix broken build
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
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")
endif()
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down