vcpkg/ports/wpilib/fix-dependency-libuv.patch

33 lines
894 B
Diff
Raw Normal View History

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 libuv::uv)
+ target_link_libraries(wpiutil libuv::uv)
+ else()
+ target_link_libraries(wpiutil libuv::uv_a)
+ endif()
endif()
if (MSVC)