mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 11:42:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix build error (#30949)

Browse Source
This commit is contained in:
Mengna Li 2023-04-19 11:26:40 +08:00 committed by GitHub
parent b925f3f8c4
commit eb8e75bb4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/tensorpipe/portfile.cmake
View File

@ -47,7 +47,7 @@ vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe" PACKAGE_NAME "Tensorpipe") vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/Tensorpipe" PACKAGE_NAME "Tensorpipe")
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/share"
) )

12
ports/tensorpipe/support-test.patch
View File

@ -1,8 +1,8 @@
diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt diff --git a/tensorpipe/test/CMakeLists.txt b/tensorpipe/test/CMakeLists.txt
index 53e8643..c49ada6 100644 index 53e8643..09baaa0 100644
--- a/tensorpipe/test/CMakeLists.txt --- a/tensorpipe/test/CMakeLists.txt
+++ b/tensorpipe/test/CMakeLists.txt +++ b/tensorpipe/test/CMakeLists.txt
@@ -93,25 +93,24 @@ if(TP_USE_CUDA) @@ -93,25 +93,30 @@ if(TP_USE_CUDA)
channel/cuda_ipc/cuda_ipc_test.cc channel/cuda_ipc/cuda_ipc_test.cc
) )
endif() endif()
@ -25,13 +25,19 @@ index 53e8643..c49ada6 100644
-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest -add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/googletest
- ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL) - ${PROJECT_BINARY_DIR}/third_party/googletest EXCLUDE_FROM_ALL)
+find_package(GTest CONFIG REQUIRED) +find_package(GTest CONFIG REQUIRED)
+
+if (TARGET uv)
+ set(LIBUV_LIBRARY uv)
+else()
+ set(LIBUV_LIBRARY uv_a)
+endif()
list(APPEND TP_TEST_LINK_LIBRARIES list(APPEND TP_TEST_LINK_LIBRARIES
tensorpipe tensorpipe
- uv::uv - uv::uv
- gmock - gmock
- gtest_main) - gtest_main)
+ unofficial::libuv::libuv + ${LIBUV_LIBRARY}
+ GTest::gmock + GTest::gmock
+ GTest::gtest_main) + GTest::gtest_main)

2
ports/tensorpipe/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "tensorpipe", "name": "tensorpipe",
"version-date": "2022-03-16", "version-date": "2022-03-16",
"port-version": 2, "port-version": 3,
"description": "A tensor-aware point-to-point communication primitive for machine learning", "description": "A tensor-aware point-to-point communication primitive for machine learning",
"homepage": "https://github.com/pytorch/tensorpipe", "homepage": "https://github.com/pytorch/tensorpipe",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

2
versions/baseline.json
View File

@ -7782,7 +7782,7 @@
}, },
"tensorpipe": { "tensorpipe": {
"baseline": "2022-03-16", "baseline": "2022-03-16",
"port-version": 2 "port-version": 3
}, },
"termcolor": { "termcolor": {
"baseline": "2.1.0", "baseline": "2.1.0",

5
versions/t-/tensorpipe.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "ea5e9e44827c85ad455621231cb7ca1f2447cdd9",
"version-date": "2022-03-16",
"port-version": 3
},
{ {
"git-tree": "eed8e7f9952716b9aa7fcde453fad358b6b7bd2f", "git-tree": "eed8e7f9952716b9aa7fcde453fad358b6b7bd2f",
"version-date": "2022-03-16", "version-date": "2022-03-16",