[Fizz] fix libsodium dependency (#22816)

* fix fizz libsodium dependency

* [fizz] fix libsodium dependency

* update version file

* [fizz] : fix dependency

* revert vcpkg.json

Co-authored-by: Jonliu1993 <13720414433@163.com>
This commit is contained in:
yuehua.jia 2022-02-01 03:27:37 +08:00 committed by GitHub
parent 912bfa9d88
commit 7146001b34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 2 deletions

View File

@ -0,0 +1,35 @@
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
index 471d61a..b3cfed2 100644
--- a/fizz/CMakeLists.txt
+++ b/fizz/CMakeLists.txt
@@ -61,7 +61,7 @@ endif()
include(CheckAtomic)
-find_package(Sodium REQUIRED)
+find_package(unofficial-sodium CONFIG REQUIRED)
SET(FIZZ_SHINY_DEPENDENCIES "")
SET(FIZZ_LINK_LIBRARIES "")
@@ -246,7 +246,7 @@ target_link_libraries(fizz
PUBLIC
${FOLLY_LIBRARIES}
${OPENSSL_LIBRARIES}
- sodium
+ unofficial-sodium::sodium
Threads::Threads
ZLIB::ZLIB
PRIVATE
diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
index 679b0e6..b28750f 100644
--- a/fizz/cmake/fizz-config.cmake.in
+++ b/fizz/cmake/fizz-config.cmake.in
@@ -26,7 +26,7 @@ endif()
set(FIZZ_LIBRARIES fizz::fizz)
include(CMakeFindDependencyMacro)
-find_dependency(Sodium)
+find_dependency(unofficial-sodium CONFIG REQUIRED)
find_dependency(folly CONFIG)
find_dependency(ZLIB)

View File

@ -8,6 +8,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix-zlib.patch
0001-fix-libsodium.patch
)
# Prefer installed config files
@ -37,4 +38,4 @@ file(REMOVE_RECURSE
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/fizz/tool/test" "${CURRENT_PACKAGES_DIR}/include/fizz/util/test")
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

View File

@ -1,6 +1,7 @@
{
"name": "fizz",
"version-string": "2021.06.14.00",
"port-version": 1,
"description": "a TLS 1.3 implementation by Facebook",
"homepage": "https://github.com/facebookincubator/fizz",
"dependencies": [

View File

@ -2174,7 +2174,7 @@
},
"fizz": {
"baseline": "2021.06.14.00",
"port-version": 0
"port-version": 1
},
"flann": {
"baseline": "2019-04-07",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8472de52ae8a7914ab4c87e23be8250ae497a0aa",
"version-string": "2021.06.14.00",
"port-version": 1
},
{
"git-tree": "522047f79c1dde2cfbc509a21b4f1faf910efb12",
"version-string": "2021.06.14.00",