7 files changed, 47 insertions, 12 deletions
diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt
index 0f46ec07e..b51630d78 100644
--- a/ports/libuv/CMakeLists.txt
+++ b/ports/libuv/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(libuv C)
 
+find_package(Threads REQUIRED)
+
 file(GLOB UV_SOURCES_COMMON src/*.c)
 
 file(GLOB UV_SOURCES_UNIX
@@ -51,7 +53,7 @@ file(GLOB UV_SOURCES_WIN src/win/*.c)
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN})
     target_compile_definitions(libuv PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600")
-    target_link_libraries(libuv iphlpapi psapi shell32 userenv ws2_32)
+    target_link_libraries(libuv PRIVATE iphlpapi psapi shell32 userenv ws2_32)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN})
 elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
@@ -60,6 +62,7 @@ else() # Assume some Linux variant
     add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX})
 endif()
 
+target_link_libraries(libuv PRIVATE Threads::Threads)
 target_include_directories(libuv PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
 set_target_properties(libuv PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED)
 
diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL
index 611be7070..8f452cb4f 100644
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@@ -1,3 +1,3 @@
 Source: libuv
-Version: 1.25.0
+Version: 1.27.0
 Description: libuv is a multi-platform support library with a focus on asynchronous I/O.
diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake
index 8179c28bb..d870d8e76 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuv/libuv
-    REF v1.25.0
-    SHA512 d1024f9193e2ad69cc670441b74ff7c63ca7d295e9a7a43c90da6781a39352687465bfe7e852d6e9085c21821bf8d11c10139c7229759fdce567d809c605acfd
+    REF v1.27.0
+    SHA512 42dfb7bee21f3f875ae5e6e4531aff52cff59d4c000f9cee1bde1b12c127beb7adefd6d6a11c6f0180868ee5ef15351a21a36c10b1be0aa7bedc15f0c50f87e0
     HEAD_REF v1.x
 )
 
diff --git a/ports/uvw/CMakeLists.txt b/ports/uvw/CMakeLists.txt
new file mode 100644
index 000000000..f359b7351
--- /dev/null
+++ b/ports/uvw/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.8)
+project(uvw)
+
+find_package(unofficial-libuv CONFIG REQUIRED)
+
+add_library(uvw INTERFACE)
+target_link_libraries(uvw INTERFACE unofficial::libuv::libuv)
+
+install(TARGETS uvw
+    EXPORT uvw
+    INCLUDES DESTINATION include/)
+
+install(EXPORT uvw
+    DESTINATION "share/uvw"
+    FILE uvw-targets.cmake
+    NAMESPACE uvw::)
+
+install(DIRECTORY
+    src/uvw/
+    DESTINATION include/uvw/)
+
+install(FILES
+    src/uvw.hpp
+    DESTINATION include/
+)
diff --git a/ports/uvw/CONTROL b/ports/uvw/CONTROL
index 0a055ad8b..59926f1a9 100644
--- a/ports/uvw/CONTROL
+++ b/ports/uvw/CONTROL
@@ -1,3 +1,4 @@
 Source: uvw
-Version: 1.11.3
+Version: 1.15.0
 Description: Header-only, event based, tiny and easy to use libuv wrapper in modern C++. <https://github.com/skypjack/uvw>
+Build-Depends: libuv
diff --git a/ports/uvw/portfile.cmake b/ports/uvw/portfile.cmake
index e7d2c9b00..0fca53590 100644
--- a/ports/uvw/portfile.cmake
+++ b/ports/uvw/portfile.cmake
@@ -4,19 +4,23 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO skypjack/uvw
-    REF v1.11.2_libuv-v1.23
-    SHA512 0125233645351b94acb1b42f1632365a60892c64f00b27f04ae76fa523c4ee32c9910f0fcfb160b15269bfb0b5ae0c0f8b46d83a1ca9f9fc661b75eecb7a04d3
+    REF v1.15.0_libuv-v1.27
+    SHA512 acf1f1bdbc34ec5d040514ca08c99ee05b5bbb112828a4acf5f4c50e1910d2c74864a0793d4087b7a4a0704dd2ba1a973f65cee032fffea9247009be9cd0243c
 )
 
-file(INSTALL
-    ${SOURCE_PATH}/src/uvw
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
 )
+vcpkg_install_cmake()
 
+vcpkg_fixup_cmake_targets(CONFIG_PATH "share/uvw")
 file(INSTALL
-    ${SOURCE_PATH}/src/uvw.hpp
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+    ${CMAKE_CURRENT_LIST_DIR}/uvw-config.cmake
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw/
 )
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright/readme/package files
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/uvw RENAME copyright)
diff --git a/ports/uvw/uvw-config.cmake b/ports/uvw/uvw-config.cmake
new file mode 100644
index 000000000..1fdc98f53
--- /dev/null
+++ b/ports/uvw/uvw-config.cmake
@@ -0,0 +1,2 @@
+find_package(unofficial-libuv CONFIG REQUIRED)
+include ("${CMAKE_CURRENT_LIST_DIR}/uvw-targets.cmake")