aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenTao Ou <admin@owent.net>2021-06-22 05:18:40 +0800
committerGitHub <noreply@github.com>2021-06-21 14:18:40 -0700
commitb56f5abcb2761b37a7f23ff9d75bfda1ee3fab1f (patch)
treee957f5f5e2486c669e18aa67d10d31c0e9f5452a
parentfbab325f475613532bf53110ed49e185851a793c (diff)
downloadvcpkg-b56f5abcb2761b37a7f23ff9d75bfda1ee3fab1f.tar.gz
vcpkg-b56f5abcb2761b37a7f23ff9d75bfda1ee3fab1f.zip
[libcopp] Update to 1.4.1 (#18425)
-rw-r--r--ports/libcopp/CONTROL5
-rw-r--r--ports/libcopp/portfile.cmake18
-rw-r--r--ports/libcopp/vcpkg.json9
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/libcopp.json5
5 files changed, 29 insertions, 10 deletions
diff --git a/ports/libcopp/CONTROL b/ports/libcopp/CONTROL
deleted file mode 100644
index dcb8a8db9..000000000
--- a/ports/libcopp/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: libcopp
-Version: 1.3.4
-Description: A cross-platfrom coroutine library for C++
-Maintainer: owent <admin@owent.net>
-Homepage: https://libcopp.atframe.work/
diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake
index 0b74e7b92..46adc578b 100644
--- a/ports/libcopp/portfile.cmake
+++ b/ports/libcopp/portfile.cmake
@@ -1,14 +1,24 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
- REPO owt5008137/libcopp
- REF d7ee2550fdcaf3961e4284bb5218e3ed05be437c # 1.3.4
- SHA512 0fa7a83c17046e187183d0244828e82adeb5e39e75b27757d1b540fd8948c48b02de40edea706d588ba553a276c4f2f8e9e3dad78065e515a1652abe4fbea8b0
+ REPO owent/libcopp
+ REF 1.4.1
+ SHA512 eba06bd2de7c9ee557cdd0bf79e0c53e37722b671347436322c14c99e94d955477bfc0980a4f59a5c31051e108f952ec96791024c45fa8eeaa5f7a49099dd8ae
HEAD_REF v2
)
+# atframework/cmake-toolset needed as a submodule for configure cmake
+vcpkg_from_github(
+ OUT_SOURCE_PATH ATFRAMEWORK_CMAKE_TOOLSET
+ REPO atframework/cmake-toolset
+ REF v1.3.5
+ SHA512 5048c204eb6358547d99712a06866836e1a6dc20dee44cc33fae77181bdf9ece5686f30062eff6a231e1ec898d5a37ebaddb243e7e3484c002bb96240aa496a5
+ HEAD_REF main
+ )
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
DISABLE_PARALLEL_CONFIGURE
+ OPTIONS "-DATFRAMEWORK_CMAKE_TOOLSET_DIR=${ATFRAMEWORK_CMAKE_TOOLSET}"
)
vcpkg_install_cmake()
@@ -19,7 +29,7 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${
vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libcopp)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
diff --git a/ports/libcopp/vcpkg.json b/ports/libcopp/vcpkg.json
new file mode 100644
index 000000000..a832fe24d
--- /dev/null
+++ b/ports/libcopp/vcpkg.json
@@ -0,0 +1,9 @@
+{
+ "name": "libcopp",
+ "version-semver": "1.4.1",
+ "maintainers": "owent <admin@owent.net>",
+ "description": "A cross-platfrom coroutine library for C++",
+ "homepage": "https://github.com/owent/libcopp",
+ "documentation": "https://libcopp.atframe.work/",
+ "license": "MIT"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index c993f9351..62aad444c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3057,7 +3057,7 @@
"port-version": 0
},
"libcopp": {
- "baseline": "1.3.4",
+ "baseline": "1.4.1",
"port-version": 0
},
"libcrafter": {
diff --git a/versions/l-/libcopp.json b/versions/l-/libcopp.json
index fb2994a7d..cbdc1024a 100644
--- a/versions/l-/libcopp.json
+++ b/versions/l-/libcopp.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "88846bda722ae7f10ec578f41c08a9cacf2ba7ba",
+ "version-semver": "1.4.1",
+ "port-version": 0
+ },
+ {
"git-tree": "22af9650936b7555dd45a5e211277095a37637dd",
"version-string": "1.3.4",
"port-version": 0