[vcpkg baseline][stdexec] Fix compilation failure under Windows (#39756)

This commit is contained in:
jim wang 2024-07-08 14:15:17 +00:00 committed by GitHub
parent a1f42e2a47
commit c439d7896b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 3 deletions

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c2874e..0c81985 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ if(NOT EXISTS ${CMAKE_BINARY_DIR}/execution.bs)
${CMAKE_BINARY_DIR}/execution.bs)
endif()
file(STRINGS "${CMAKE_BINARY_DIR}/execution.bs" STD_EXECUTION_BS_REVISION_LINE REGEX "Revision: [0-9]+")
-string(REGEX REPLACE "Revision: ([0-9]+)" "\\1" STD_EXECUTION_BS_REVISION ${STD_EXECUTION_BS_REVISION_LINE})
+string(REGEX REPLACE "Revision: ([0-9]+).*" "\\1" STD_EXECUTION_BS_REVISION ${STD_EXECUTION_BS_REVISION_LINE})
# nvc++ isn't supported by (s)ccache yet, so unset these before the `project()`
# call so CMake's CXX compiler detection doesn't throw attempting to use it

View File

@ -5,6 +5,8 @@ vcpkg_from_github(
REF 089c4613385f808c3b39c4f4915f658157013a36
SHA512 a9c1d4009b71bfc280801814272319312b8edcd3106c5fd8fdab6fc2eb2c64be4a01374026de02129389e4d2280599b14a3c037566a1bbefcd6b48c5052d583b
HEAD_REF main
PATCHES
fix-version.patch
)
vcpkg_from_github(
@ -23,9 +25,9 @@ vcpkg_download_distfile(RAPIDS_cmake
file(COPY "${RAPIDS_cmake}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/")
vcpkg_download_distfile(execution_bs
URLS "https://raw.githubusercontent.com/brycelelbach/wg21_p2300_execution/R7/execution.bs"
URLS "https://raw.githubusercontent.com/cplusplus/sender-receiver/main/execution.bs"
FILENAME "execution.bs"
SHA512 90f2a1d150b03c29bb05a5420e091c2371cb973335a089916716d778bc1081764436dc1ff0fec60f642ddb0ca5492c8b0c3a6d5451c2d60a42911f918fe980fa
SHA512 90bb992356f22e4091ed35ca922f6a0143abd748499985553c0660eaf49f88d031a8f900addb6b4cf9a39ac8d1ab7c858b79677e2459136a640b2c52afe3dd23
)
file(COPY "${execution_bs}" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/")

View File

@ -1,6 +1,7 @@
{
"name": "stdexec",
"version-date": "2024-06-16",
"port-version": 1,
"description": "stdexec is an experimental reference implementation of the Senders model of asynchronous programming proposed by P2300 - std::execution for adoption into the C++ Standard.",
"homepage": "https://github.com/NVIDIA/stdexec",
"license": "Apache-2.0",

View File

@ -8522,7 +8522,7 @@
},
"stdexec": {
"baseline": "2024-06-16",
"port-version": 0
"port-version": 1
},
"stduuid": {
"baseline": "1.2.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1bc8de1856cd06c3b1c1a04c580ef085b3f766ab",
"version-date": "2024-06-16",
"port-version": 1
},
{
"git-tree": "dd6ff11019e7fada3711cc8531e192d6ca05d731",
"version-date": "2024-06-16",