mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 02:49:01 +08:00
6647a76be8
* [fbthrift, fizz, folly] Fix dependency resolution. Found by nightly build https://dev.azure.com/vcpkg/public/_build/results?buildId=67402 * wangle was fixed by a compiler update on a patch tuesday. * this unblocked attempting fbthrift on x64-windows hosts, but it misses a header; added patch already merged upstream adding missing algorithm <include> * fixed folly attempt to insert the right debug prefix which was broken by vcpkg_fixup_cmake_targets no longer generating _IMPORT_PREFIX. * disable dynamic build of fbthrift on Windows because it tries to create DLLs with no import libs (because it makes no exports) * Format and fix version database. * Back out fizz patches. * Block dynamic flavors. (The build in question builds an exe and expects all its dependencies to be linked statically and patching the build system to copy over the right DLLs seems out of scope) * Add libevent patch. * Also fixup mvfst and add missing CONFIG to patch. * Remove unused patch. * Fix version sha
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt
|
|
index 80c5051..9f2e3e6 100644
|
|
--- a/fizz/CMakeLists.txt
|
|
+++ b/fizz/CMakeLists.txt
|
|
@@ -92,10 +92,10 @@ endif()
|
|
|
|
find_package(ZLIB REQUIRED)
|
|
|
|
-find_package(Libevent CONFIG QUIET)
|
|
-if(TARGET event)
|
|
+find_package(Libevent CONFIG REQUIRED)
|
|
+if(TARGET libevent::core)
|
|
message(STATUS "Found libevent from package config")
|
|
- list(APPEND FIZZ_SHINY_DEPENDENCIES event)
|
|
+ list(APPEND FIZZ_SHINY_DEPENDENCIES libevent::core)
|
|
else()
|
|
find_package(Libevent MODULE REQUIRED)
|
|
list(APPEND FIZZ_LINK_LIBRARIES ${LIBEVENT_LIB})
|
|
diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in
|
|
index b28750f..282c42d 100644
|
|
--- a/fizz/cmake/fizz-config.cmake.in
|
|
+++ b/fizz/cmake/fizz-config.cmake.in
|
|
@@ -29,6 +29,7 @@ include(CMakeFindDependencyMacro)
|
|
find_dependency(unofficial-sodium CONFIG REQUIRED)
|
|
find_dependency(folly CONFIG)
|
|
find_dependency(ZLIB)
|
|
+find_dependency(Libevent CONFIG)
|
|
|
|
if (NOT fizz_FIND_QUIETLY)
|
|
message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}")
|