mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[libcoro] Update to 0.11.1 (#37425)
This commit is contained in:
parent
74e71c6bc9
commit
2b6075beac
@ -1,9 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -92,4 +92,4 @@
|
||||
endif()
|
||||
|
||||
-add_library(${PROJECT_NAME} STATIC ${LIBCORO_SOURCE_FILES})
|
||||
+add_library(${PROJECT_NAME} ${LIBCORO_SOURCE_FILES})
|
||||
set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX PREFIX "")
|
@ -1,18 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
# Set the githooks directory to auto format and update the readme.
|
||||
-message("${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} -> git config --local core.hooksPath .githooks")
|
||||
-execute_process(
|
||||
- COMMAND git config --local core.hooksPath .githooks
|
||||
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
-)
|
||||
+#message("${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} -> git config --local core.hooksPath .githooks")
|
||||
+#execute_process(
|
||||
+# COMMAND git config --local core.hooksPath .githooks
|
||||
+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
+#)
|
||||
|
||||
option(LIBCORO_EXTERNAL_DEPENDENCIES "Use Cmake find_package to resolve dependencies instead of embedded libraries, Default=OFF." OFF)
|
@ -1,10 +0,0 @@
|
||||
diff --git a/libcoro.pc.in b/libcoro.pc.in
|
||||
--- a/libcoro.pc.in
|
||||
+++ b/libcoro.pc.in
|
||||
@@ -1,5 +1,5 @@
|
||||
prefix="@CMAKE_INSTALL_PREFIX@"
|
||||
libdir="${prefix}/lib"
|
||||
-includedir="@CMAKE_INSTALL_INCLUDEDIR@"
|
||||
+includedir="${prefix}/include"
|
||||
|
||||
Name: @PROJECT_NAME@
|
@ -1,16 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -186,7 +186,11 @@
|
||||
|
||||
|
||||
# generate pc file for pkg-config
|
||||
-string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME})
|
||||
+if(MSVC)
|
||||
+ set(target1 ${PROJECT_NAME})
|
||||
+else()
|
||||
+ string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME})
|
||||
+endif()
|
||||
configure_file(libcoro.pc.in libcoro.pc @ONLY)
|
||||
|
||||
install(TARGETS libcoro)
|
@ -1,27 +1,19 @@
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
endif()
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO jbaldwin/libcoro
|
||||
REF "v${VERSION}"
|
||||
SHA512 88d5954591493ad2942fa68ead65b67fa9ac26bcc260b3156844244968dd8477d62a3559a9d3b7b1175bf813e5f23ca2d288a72baeb3ebd774e756d3c06bfee8
|
||||
SHA512 fd3eb22a055db9567da482182a90d44c79ee8ccb641490945cb45b07686a32a31b7b37aa35b1f3f676a6ede366db01c9cd7b5f7ded899cb1133cdd1aac510154
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001-allow-shared-lib.patch
|
||||
0002-disable-git-config.patch
|
||||
0003-fix-pkgconfig-includedir.patch
|
||||
0004-fix-pkgconfig-on-windows.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
networking LIBCORO_FEATURE_NETWORKING
|
||||
platform LIBCORO_FEATURE_PLATFORM
|
||||
ssl LIBCORO_FEATURE_SSL
|
||||
tls LIBCORO_FEATURE_TLS
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
@ -29,6 +21,7 @@ vcpkg_cmake_configure(
|
||||
-DLIBCORO_EXTERNAL_DEPENDENCIES=ON
|
||||
-DLIBCORO_BUILD_TESTS=OFF
|
||||
-DLIBCORO_BUILD_EXAMPLES=OFF
|
||||
-DLIBCORO_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
@ -38,3 +31,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "libcoro",
|
||||
"version": "0.10",
|
||||
"version": "0.11.1",
|
||||
"description": "C++20 coroutine library",
|
||||
"homepage": "https://github.com/jbaldwin/libcoro",
|
||||
"license": "Apache-2.0",
|
||||
@ -10,22 +10,15 @@
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"default-features": [
|
||||
"networking",
|
||||
"ssl"
|
||||
],
|
||||
"features": {
|
||||
"networking": {
|
||||
"description": "Include networking features.",
|
||||
"supports": "linux",
|
||||
"dependencies": [
|
||||
"c-ares"
|
||||
]
|
||||
},
|
||||
"platform": {
|
||||
"description": "Include linux platform features.",
|
||||
"supports": "linux"
|
||||
},
|
||||
"ssl": {
|
||||
"tls": {
|
||||
"description": "Include SSL features.",
|
||||
"dependencies": [
|
||||
{
|
||||
|
@ -4221,7 +4221,7 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"libcoro": {
|
||||
"baseline": "0.10",
|
||||
"baseline": "0.11.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"libcorrect": {
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "b518fbd7c395e04a3a720c1aba78a3a9a94930e9",
|
||||
"version": "0.11.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "da37665bbdb4cdb391d48037308acb4db271aacf",
|
||||
"version": "0.10",
|
||||
|
Loading…
x
Reference in New Issue
Block a user