-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
miyanyan
wants to merge
6
commits into
microsoft:master
Choose a base branch
from
miyanyan:add-ucoro
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+92
−0
Open
[ucoro] add new port #42969
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
+) | ||
|
||
-enable_testing() | ||
-add_subdirectory(tests) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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() | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To complement the previous suggestion:
Suggested change
|
||||||
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
{ | ||
"versions": [ | ||
{ | ||
"git-tree": "d461a5bc5382ef0d0b4cd776a861c416099ca2e9", | ||
"version": "1.0", | ||
"port-version": 0 | ||
} | ||
] | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NAMESPACE ...::
here.