[libcoppp] Update version to 1.3.0 #12264
Merged
Conversation
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
JackBoosY
added
the
category:port-update
JackBoosY
suggested changes
Jul 6, 2020
JackBoosY
suggested changes
Jul 6, 2020
NancyLi1013
suggested changes
Jul 6, 2020
NancyLi1013
suggested changes
Jul 6, 2020
Update ports/libcopp/portfile.cmake Co-authored-by: Jack·Boos·Yu <[email protected]> Update libcopp to 1.3.1 Update CONTROL of libcopp Remove useless ```if() ... endif()``` branch Replace ```file(COPY ...)``` with ```file(INSTALL ...)```
|
Hi @owt5008137, this looks 95% ready to merge! However, we do not intend For information about static linking, we prefer users access our docs[1]. For library changes, we encourage users to visit the homepage. Here is the diff that brings this PR to 100% -- I was unable to push it to this PR because you've unchecked the "allow edits" box: diff --git a/ports/libcopp/CONTROL b/ports/libcopp/CONTROL
index 415c2a90c..8c9162540 100644
--- a/ports/libcopp/CONTROL
+++ b/ports/libcopp/CONTROL
@@ -1,5 +1,6 @@
Source: libcopp
Version: 1.3.1
+Port-Version: 1
Description: A cross-platfrom coroutine library for C++
Maintainer: owent <[email protected]>
Homepage: https://libcopp.atframe.work/
diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake
index e0e59c5d8..5b6be64bb 100644
--- a/ports/libcopp/portfile.cmake
+++ b/ports/libcopp/portfile.cmake
@@ -6,17 +6,14 @@ vcpkg_from_github(
HEAD_REF v2
)
-# Use libcopp's own build process, skipping examples and tests
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
DISABLE_PARALLEL_CONFIGURE
- # PREFER_NINJA # Disabled because Ninja does not invoke masm correctly for this project
)
vcpkg_install_cmake()
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/BOOST_LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libcopp/usage b/ports/libcopp/usage
deleted file mode 100644
index 6e992196c..000000000
--- a/ports/libcopp/usage
+++ /dev/null
@@ -1,31 +0,0 @@
-The package libcopp provides CMake integration:
-
- find_package(Libcopp CONFIG REQUIRED)
- target_link_libraries(main PRIVATE libcopp::cotask)
- # Or just using copp by target_link_libraries(main PRIVATE libcopp::copp)
-
-If using MSVC, CRT must match the triplet of vcpkg, these codes below may be helpful:
-
- if (MSVC AND VCPKG_TOOLCHAIN)
- string(REGEX MATCH "^.*windows-static$" CHECK_VCPKG_TARGET_TRIPLET_RUNTIME ${VCPKG_TARGET_TRIPLET})
- message(STATUS "CHECK_VCPKG_TARGET_TRIPLET_RUNTIME=${CHECK_VCPKG_TARGET_TRIPLET_RUNTIME}")
- if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
- set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
- endif()
- if (CHECK_VCPKG_TARGET_TRIPLET_RUNTIME)
- set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>" CACHE STRING "")
- set(CMAKE_MSVC_RUNTIME "/MT$<$<CONFIG:Debug>:d>")
- else ()
- set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL" CACHE STRING "")
- set(CMAKE_MSVC_RUNTIME "/MD$<$<CONFIG:Debug>:d>")
- endif ()
- target_compile_options(main PRIVATE ${CMAKE_MSVC_RUNTIME})
- endif ()
-
-BREAK CHANGES & UPGRADE GUIDE FROM 1.2.X
-
-+ Rename ```cotask::task::await``` into ```cotask::task::await_task```
-+ Replace ```cotask::task<TCO_MACRO, TTASK_MACRO>``` with ```cotask::task<TCO_MACRO>``` , we don't allow to custom id allocator now.
-+ Replace ```cotask::core::standard_int_id_allocator<uint64_t>``` with ```copp::util::uint64_id_allocator``` , we don't allow to custom id allocator now.
-+ Require gcc 4.7+, MSVC 14+(Visual Studio 2015)>)
-+ Require cmake 3.12.0 or upper
diff --git a/ports/libcopp/vcpkg-cmake-wrapper.cmake b/ports/libcopp/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 175ff8d25..000000000
--- a/ports/libcopp/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1 +0,0 @@
-_find_package(${ARGS} CONFIG)
\ No newline at end of file |
Merged. I can not see the "allow edits" box on this PR page. |
NancyLi1013
approved these changes
Jul 7, 2020
|
Thanks for the update! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Describe the pull request
Nothing
All x86 and x64 triplets. Yes
Yes