Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ucoro] add new port #42969

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions ports/ucoro/cmake-install.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 663044e..6d8e460 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,31 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
add_compile_options(-foptimize-sibling-calls)
endif()

+include(GNUInstallDirs)
+
add_library(ucoro INTERFACE)
-target_include_directories(ucoro INTERFACE include)
+target_include_directories(ucoro INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+option(UCORO_BUILD_TESTING "Build the tests" ON)
+if (UCORO_BUILD_TESTING)
+ enable_testing()
+ add_subdirectory(tests)
+endif()
+
+install(
+ TARGETS ucoro
+ EXPORT ucoroTargets
+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+install(
+ DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ucoro
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+# generate config.cmake
+install(
+ EXPORT ucoroTargets
+ FILE ucoro-config.cmake
+ DESTINATION "share/ucoro"
+)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • There should be NAMESPACE ...:: here.
  • If the CMake config isn't provided by upstream, vcpkg ask for the prefix "unofficial".
Suggested change
+# generate config.cmake
+install(
+ EXPORT ucoroTargets
+ FILE ucoro-config.cmake
+ DESTINATION "share/ucoro"
+)
+install(
+ EXPORT ucoroTargets
+ FILE unofficial-ucoro-config.cmake
+ NAMESPACE unofficial::ucoro::
+ DESTINATION "share/unofficial-ucoro"
+)


-enable_testing()
-add_subdirectory(tests)
25 changes: 25 additions & 0 deletions ports/ucoro/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO avplayer/ucoro
REF "v${VERSION}"
SHA512 c3436b436ef1ebb3d47a65db9603842293bdb6451bc6fb738a63d61a63b52901e223f46625d956303566dc52dfb38ffb2c6ce20016c18b444f9cb3e2e701e613
HEAD_REF main
PATCHES
cmake-install.patch
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DUCORO_BUILD_TESTING=OFF
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To complement the previous suggestion:

Suggested change
vcpkg_cmake_config_fixup()
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-ucoro)

vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug"
)

miyanyan marked this conversation as resolved.
Show resolved Hide resolved
file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
16 changes: 16 additions & 0 deletions ports/ucoro/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "ucoro",
"version": "1.0",
"description": "It is a minimized C++20 coroutine library.",
"homepage": "https://github.com/avplayer/ucoro",
miyanyan marked this conversation as resolved.
Show resolved Hide resolved
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
4 changes: 4 additions & 0 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -9204,6 +9204,10 @@
"baseline": "0.0.8",
"port-version": 0
},
"ucoro": {
"baseline": "1.0",
"port-version": 0
},
"udt": {
"baseline": "4.11",
"port-version": 0
Expand Down
9 changes: 9 additions & 0 deletions versions/u-/ucoro.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "d461a5bc5382ef0d0b4cd776a861c416099ca2e9",
"version": "1.0",
"port-version": 0
}
]
}
Loading