mirror of https://github.com/microsoft/vcpkg.git
[cpp-httplib] update to 0.29.0 (#49087)
This commit is contained in:
parent
bc98625115
commit
64e1fbee7d
|
|
@ -1,8 +1,8 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0353b0c..5c0cd33 100644
|
||||
index 7566dcd..7687c8b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -151,10 +151,10 @@ endif()
|
||||
@@ -178,10 +178,10 @@ endif()
|
||||
# This is so we can use our custom FindBrotli.cmake
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
if(HTTPLIB_REQUIRE_BROTLI)
|
||||
|
|
@ -15,9 +15,9 @@ index 0353b0c..5c0cd33 100644
|
|||
set(HTTPLIB_IS_USING_BROTLI ${Brotli_FOUND})
|
||||
endif()
|
||||
|
||||
@@ -236,9 +236,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
|
||||
# Needed for API from MacOS Security framework
|
||||
"$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN}>>:-framework CoreFoundation -framework Security>"
|
||||
@@ -280,9 +280,9 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
|
||||
# Needed for non-blocking getaddrinfo on MacOS
|
||||
"$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_USE_NON_BLOCKING_GETADDRINFO}>>:-framework CFNetwork>"
|
||||
# Can't put multiple targets in a single generator expression or it bugs out.
|
||||
- $<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::common>
|
||||
- $<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::encoder>
|
||||
|
|
@ -28,7 +28,7 @@ index 0353b0c..5c0cd33 100644
|
|||
$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:ZLIB::ZLIB>
|
||||
$<$<BOOL:${HTTPLIB_IS_USING_ZSTD}>:zstd::libzstd>
|
||||
$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::SSL>
|
||||
@@ -296,9 +296,6 @@ if(HTTPLIB_INSTALL)
|
||||
@@ -341,9 +341,6 @@ if(HTTPLIB_INSTALL)
|
||||
install(FILES
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
|
||||
|
|
@ -39,10 +39,10 @@ index 0353b0c..5c0cd33 100644
|
|||
)
|
||||
|
||||
diff --git a/cmake/httplibConfig.cmake.in b/cmake/httplibConfig.cmake.in
|
||||
index bf57364..1c6fe62 100644
|
||||
index 8ca8b99..9c61742 100644
|
||||
--- a/cmake/httplibConfig.cmake.in
|
||||
+++ b/cmake/httplibConfig.cmake.in
|
||||
@@ -34,8 +34,8 @@ if(@HTTPLIB_IS_USING_BROTLI@)
|
||||
@@ -35,8 +35,8 @@ if(@HTTPLIB_IS_USING_BROTLI@)
|
||||
# Note that the FindBrotli.cmake file is installed in the same dir as this file.
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
|
||||
set(BROTLI_USE_STATIC_LIBS @BROTLI_USE_STATIC_LIBS@)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO yhirose/cpp-httplib
|
||||
REF "v${VERSION}"
|
||||
SHA512 e7a8877d489c97669a8ee536e1498575be921e558ed947253013fe6b67a49d4569eedd01f543caa70183b92d8ac0e8687d662a70d880954412e387317008a239
|
||||
SHA512 39dbcbb4b48482dcd7ddc56e10e71aad5595690ce1555c1f69d4f7d0fff77f028f95359fe964236a6cdcf7fb42a6b084d0ebba58d4e9446372689699bd5ed624
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-find-brotli.patch
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "cpp-httplib",
|
||||
"version": "0.28.0",
|
||||
"version": "0.29.0",
|
||||
"description": "A single file C++11 header-only HTTP/HTTPS server and client library",
|
||||
"homepage": "https://github.com/yhirose/cpp-httplib",
|
||||
"license": "MIT",
|
||||
|
|
|
|||
|
|
@ -2009,7 +2009,7 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"cpp-httplib": {
|
||||
"baseline": "0.28.0",
|
||||
"baseline": "0.29.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"cpp-ipc": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "81ddfd97e468e457e05b1e584e8bc051bdab586a",
|
||||
"version": "0.29.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "88f373916a0ce10d4e5d2eb4308e4534efd62e1d",
|
||||
"version": "0.28.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue