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.

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] Allow disabling Crypto++ ASM using a triplet file #27361

Merged
merged 1 commit into from
Oct 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion ports/cryptopp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ endif()
# disable assembly on ARM Windows to fix broken build
if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^arm")
set(CRYPTOPP_DISABLE_ASM "ON")
else()
elseif(NOT DEFINED CRYPTOPP_DISABLE_ASM) # Allow disabling using a triplet file
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I strongly prefer to not have "disable" options, to avoid negated negations, but this is (a) what is already here and (b) consistent with upstream's option, so I think it's OK.

set(CRYPTOPP_DISABLE_ASM "OFF")
endif()

Expand All @@ -59,6 +59,8 @@ vcpkg_cmake_configure(
-DBUILD_TESTING=OFF
-DBUILD_DOCUMENTATION=OFF
-DDISABLE_ASM=${CRYPTOPP_DISABLE_ASM}
-DUSE_INTERMEDIATE_OBJECTS_TARGET=OFF # Not required when we build static only
-DCMAKE_POLICY_DEFAULT_CMP0063=NEW # Honor "<LANG>_VISIBILITY_PRESET" properties
)

vcpkg_cmake_install ()
Expand Down
2 changes: 1 addition & 1 deletion ports/cryptopp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cryptopp",
"version": "8.6.0",
"port-version": 1,
"port-version": 2,
"description": "Crypto++ is a free C++ class library of cryptographic schemes.",
"homepage": "https://github.com/weidai11/cryptopp",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1754,7 +1754,7 @@
},
"cryptopp": {
"baseline": "8.6.0",
"port-version": 1
"port-version": 2
},
"cserialport": {
"baseline": "4.1.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/cryptopp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1aecd97d5b5c29bc51bab7892b15035a8e24002d",
"version": "8.6.0",
"port-version": 2
},
{
"git-tree": "9d23fcfb280c3508aabac1d7e0f83440dcb8627f",
"version": "8.6.0",
Expand Down