mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-29 18:59:07 +08:00
761c81d433
* [boost] update generator script for boost 1.76 * [boost] update ports to 1.76.0 (run generator) * [boost] fix windows build? * [quantlib] update and fix mac build * [symengine] update and fix build * [avro-cpp] update to latest master and fix windows build * [folly] update to 2021.05.31.00 * [fbthrift, fizz, wangle] update to v2021.05.31.00 and fix build * [proxygen] update to version 2021.05.31.00 * [fizz, proxygen, fbthrift] fix sodium target * [proxygen] also works on macOS * [quantlib] use fix from upstream to fix mac build * [symengine] minimize patch file and fix deprecation warning * [folly,proxygen,wangle,fizz,fbthrift] update to 2021.06.14.00 * [fbthrift] remove unnecessary dependency rsocket I couldn't find any information that this dependency exists. The term is used in the code, but not in the context of a dependency * [fizz,fbthrift] fix zlib dependency * [fbthrift] pass required flex executable to cmake configure * add version files * [boost] generate-ports.ps1: Apply code review * [boost] changes from new version of generate-ports script * update version files * [boost] generate-ports.ps1: Apply code review
37 lines
1013 B
Diff
37 lines
1013 B
Diff
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
|
|
index 485e38fc..471d61a5 100644
|
|
--- a/fizz/CMakeLists.txt
|
|
+++ b/fizz/CMakeLists.txt
|
|
@@ -87,6 +87,8 @@ else()
|
|
list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR})
|
|
endif()
|
|
|
|
+find_package(ZLIB REQUIRED)
|
|
+
|
|
find_package(Libevent CONFIG QUIET)
|
|
if(TARGET event)
|
|
message(STATUS "Found libevent from package config")
|
|
@@ -246,6 +248,7 @@ target_link_libraries(fizz
|
|
${OPENSSL_LIBRARIES}
|
|
sodium
|
|
Threads::Threads
|
|
+ ZLIB::ZLIB
|
|
PRIVATE
|
|
${GLOG_LIBRARIES}
|
|
${GFLAGS_LIBRARIES}
|
|
diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
|
|
index d9918469..679b0e61 100644
|
|
--- a/fizz/cmake/fizz-config.cmake.in
|
|
+++ b/fizz/cmake/fizz-config.cmake.in
|
|
@@ -25,7 +25,10 @@ endif()
|
|
|
|
set(FIZZ_LIBRARIES fizz::fizz)
|
|
|
|
+include(CMakeFindDependencyMacro)
|
|
find_dependency(Sodium)
|
|
+find_dependency(folly CONFIG)
|
|
+find_dependency(ZLIB)
|
|
|
|
if (NOT fizz_FIND_QUIETLY)
|
|
message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}")
|