mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 04:09:03 +08:00
72ef222e77
* [libuv] update to <1.44.1> * update version * fix ci error * update version * fix-ci-error * [libuv] update to <1.44.1> * update version * add patch * update version * add option * update version * delete patch * update evrsion * fix ci error * update version * delete patch * update evrsion * Use official CMakeLists.txt * Fix build type * Re-fix, fix pkgconfig * Fix usocket build * Fix uvw build * Fix wpilib build * Fix cmake build * Fix tensorpipe build * Fix qpid-proton build * modern portfile * update version * Add licese * update version * Update ports/usockets/CMakeLists.txt * update version * Add usage * Apply suggestion * version * Disable to build examples * version * typo * version * Fix find_package * version * Update version Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
33 lines
873 B
Diff
33 lines
873 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 3930be2..f57a46b 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -87,7 +87,7 @@ else()
|
|
endif()
|
|
|
|
if (USE_VCPKG_LIBUV)
|
|
-set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)")
|
|
+set (LIBUV_VCPKG_REPLACE "find_package(libuv CONFIG)")
|
|
endif()
|
|
|
|
if (USE_VCPKG_EIGEN)
|
|
diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt
|
|
index 559c8ed..0fe60e9 100644
|
|
--- a/wpiutil/CMakeLists.txt
|
|
+++ b/wpiutil/CMakeLists.txt
|
|
@@ -210,8 +210,12 @@ if (NOT USE_VCPKG_LIBUV)
|
|
endif()
|
|
endif()
|
|
else()
|
|
- find_package(unofficial-libuv CONFIG REQUIRED)
|
|
- target_link_libraries(wpiutil unofficial::libuv::libuv)
|
|
+ find_package(libuv CONFIG REQUIRED)
|
|
+ if (TARGET uv)
|
|
+ target_link_libraries(wpiutil uv)
|
|
+ else()
|
|
+ target_link_libraries(wpiutil uv_a)
|
|
+ endif()
|
|
endif()
|
|
|
|
if (MSVC)
|