mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 08:58:59 +08:00
[libwebsockets] Update to v4.3.2 (#28095)
* Update libwebsockets port * Fix patches * Format manifest * Add version
This commit is contained in:
parent
93231afc50
commit
382c902fbc
@ -1,37 +1,35 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index f9b5557..ebc624b 100644
|
--- a/CMakeLists.txt (revision b0a749c8e7a8294b68581ce4feac0e55045eb00b)
|
||||||
--- a/CMakeLists.txt
|
+++ b/CMakeLists.txt (date 1669850632899)
|
||||||
+++ b/CMakeLists.txt
|
@@ -1071,8 +1071,8 @@
|
||||||
@@ -1045,8 +1045,8 @@ file(RELATIVE_PATH
|
|
||||||
"${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}"
|
"${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}"
|
||||||
"${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir.
|
"${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir.
|
||||||
|
|
||||||
-if (DEFINED REL_INCLUDE_DIR)
|
-if (DEFINED REL_INCLUDE_DIR)
|
||||||
- set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}")
|
- set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}")
|
||||||
+if (1)
|
+if (1)
|
||||||
+ set(LWS__INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../include")
|
+ set(LWS__INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../include")
|
||||||
endif()
|
endif()
|
||||||
|
if (DEFINED OPENSSL_INCLUDE_DIRS)
|
||||||
configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
|
set(LWS__INCLUDE_DIRS "${LWS__INCLUDE_DIRS};${OPENSSL_INCLUDE_DIRS}")
|
||||||
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
|
||||||
index 85b43d5..724f0b7 100644
|
--- a/lib/CMakeLists.txt (revision b0a749c8e7a8294b68581ce4feac0e55045eb00b)
|
||||||
--- a/lib/CMakeLists.txt
|
+++ b/lib/CMakeLists.txt (date 1669850782017)
|
||||||
+++ b/lib/CMakeLists.txt
|
@@ -174,7 +174,7 @@
|
||||||
@@ -164,7 +164,7 @@ if (LWS_WITH_STATIC)
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
|
||||||
)
|
)
|
||||||
- target_include_directories(websockets PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
|
- target_include_directories(websockets PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
|
||||||
+ target_include_directories(websockets PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
|
+ target_include_directories(websockets PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
|
||||||
target_compile_definitions(websockets PRIVATE LWS_BUILDING_STATIC)
|
target_compile_definitions(websockets PRIVATE LWS_BUILDING_STATIC)
|
||||||
|
target_include_directories(websockets PUBLIC ${LWS_PUBLIC_INCLUDES})
|
||||||
if (WIN32)
|
set(LWS_PUBLIC_INCLUDES ${LWS_PUBLIC_INCLUDES} PARENT_SCOPE)
|
||||||
@@ -190,7 +190,7 @@ if (LWS_WITH_SHARED)
|
@@ -202,7 +202,7 @@
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
|
||||||
)
|
)
|
||||||
- target_include_directories(websockets_shared PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
|
- target_include_directories(websockets_shared PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
|
||||||
+ target_include_directories(websockets_shared PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
|
+ target_include_directories(websockets_shared PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
|
||||||
target_compile_definitions(websockets_shared PRIVATE LWS_BUILDING_SHARED)
|
target_compile_definitions(websockets_shared PRIVATE LWS_BUILDING_SHARED)
|
||||||
|
target_include_directories(websockets_shared PUBLIC ${LWS_PUBLIC_INCLUDES})
|
||||||
# We want the shared lib to be named "libwebsockets"
|
set(LWS_PUBLIC_INCLUDES ${LWS_PUBLIC_INCLUDES} PARENT_SCOPE)
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index 1e737e5..75534c1 100644
|
--- a/CMakeLists.txt (revision b0a749c8e7a8294b68581ce4feac0e55045eb00b)
|
||||||
--- a/CMakeLists.txt
|
+++ b/CMakeLists.txt (date 1669850509296)
|
||||||
+++ b/CMakeLists.txt
|
@@ -494,6 +494,11 @@
|
||||||
@@ -422,6 +422,11 @@ set(LWS_LIBMOUNT_LIBRARIES CACHE PATH "Path to the libmount library")
|
|
||||||
set(LWS_EXT_PTHREAD_INCLUDE_DIR CACHE PATH "Path to an external pthreads include directory")
|
set(LWS_EXT_PTHREAD_INCLUDE_DIR CACHE PATH "Path to an external pthreads include directory")
|
||||||
set(LWS_EXT_PTHREAD_LIBRARIES CACHE PATH "Path to an external pthreads library")
|
set(LWS_EXT_PTHREAD_LIBRARIES CACHE PATH "Path to an external pthreads library")
|
||||||
|
|
||||||
@ -14,12 +13,12 @@ index 1e737e5..75534c1 100644
|
|||||||
|
|
||||||
if (LWS_WITH_HTTP_STREAM_COMPRESSION)
|
if (LWS_WITH_HTTP_STREAM_COMPRESSION)
|
||||||
set(LWS_WITH_ZLIB 1)
|
set(LWS_WITH_ZLIB 1)
|
||||||
@@ -728,7 +733,7 @@ if (MSVC)
|
@@ -850,7 +855,7 @@
|
||||||
# Turn off pointless microsoft security warnings.
|
# Turn off pointless microsoft security warnings.
|
||||||
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
|
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
|
||||||
# Fail the build if any warnings
|
# Fail the build if any warnings
|
||||||
- add_compile_options(/W3 /WX)
|
- add_compile_options(/W3 /WX)
|
||||||
+ add_compile_options(/W3 /WX /wd4142 /wd4267 /wd4996)
|
+ add_compile_options(/W3 /WX /wd4142 /wd4267 /wd4996)
|
||||||
endif(MSVC)
|
# Unbreak MSVC broken preprocessor __VA_ARGS__ behaviour
|
||||||
|
if (MSVC_VERSION GREATER 1925)
|
||||||
if (MINGW)
|
add_compile_options(/Zc:preprocessor /wd5105)
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO warmcat/libwebsockets
|
REPO warmcat/libwebsockets
|
||||||
REF a5aae049b2a386712e1be3b417915c0d44c7e675 # v4.3.0
|
REF b0a749c8e7a8294b68581ce4feac0e55045eb00b # v4.3.2
|
||||||
SHA512 ab72201880360a3b0136497c1c1729656c3c07043f38cceec136f5671be15ab55c80136ec7480841175d3add711593ddde23cefd39ea9cb729ec0842950602dd
|
SHA512 48c1d59cfdbe6cc043a51e950a614273bd2f9bbfd0ab8436e4ba30bf119cfdbc3e691c02608e8c169356ec79ca96472340d98d17659b66ee60bb998f3695d3c4
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
fix-dependency-libuv.patch
|
fix-dependency-libuv.patch
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "libwebsockets",
|
"name": "libwebsockets",
|
||||||
"version-semver": "4.3.0",
|
"version-semver": "4.3.2",
|
||||||
"port-version": 3,
|
|
||||||
"description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.",
|
"description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.",
|
||||||
"homepage": "https://github.com/warmcat/libwebsockets",
|
"homepage": "https://github.com/warmcat/libwebsockets",
|
||||||
"supports": "!uwp",
|
"supports": "!uwp",
|
||||||
|
@ -4389,8 +4389,8 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"libwebsockets": {
|
"libwebsockets": {
|
||||||
"baseline": "4.3.0",
|
"baseline": "4.3.2",
|
||||||
"port-version": 3
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"libx11": {
|
"libx11": {
|
||||||
"baseline": "1.8.1",
|
"baseline": "1.8.1",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "c8e1982ef72a330a813aafd1734c728a662701b1",
|
||||||
|
"version-semver": "4.3.2",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "52c31e301f0eaa969b7850c20be357ec3f845994",
|
"git-tree": "52c31e301f0eaa969b7850c20be357ec3f845994",
|
||||||
"version-semver": "4.3.0",
|
"version-semver": "4.3.0",
|
||||||
|
Loading…
Reference in New Issue
Block a user