Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4564

4 files changed, 36 insertions, 8 deletions

diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt
index 33878471c..0f46ec07e 100644
--- a/ports/libuv/CMakeLists.txt
+++ b/ports/libuv/CMakeLists.txt
@@ -19,22 +19,32 @@ file(GLOB UV_SOURCES_UNIX
     src/unix/stream.c
     src/unix/tcp.c
     src/unix/thread.c
-    src/unix/timer.c
     src/unix/tty.c
     src/unix/udp.c
-    src/unix/proctitle.c
 )
 file(GLOB UV_SOURCES_LINUX
+    src/unix/proctitle.c
     src/unix/linux-core.c
     src/unix/linux-inotify.c
     src/unix/linux-syscalls.c
+    src/unix/procfs-exepath.c
+    src/unix/sysinfo-loadavg.c
+    src/unix/sysinfo-memory.c
 )
 file(GLOB UV_SOURCES_DARWIN
-    src/unix/kqueue.c
+    src/unix/proctitle.c
     src/unix/darwin.c
     src/unix/fsevents.c
-    src/unix/pthread-barrier.c
     src/unix/darwin-proctitle.c
+    src/unix/bsd-ifaddrs.c
+    src/unix/kqueue.c
+)
+file(GLOB UV_SOURCES_FREEBSD
+    src/unix/freebsd.c
+    src/unix/posix-hrtime.c
+    src/unix/bsd-proctitle.c
+    src/unix/bsd-ifaddrs.c
+    src/unix/kqueue.c
 )
 file(GLOB UV_SOURCES_WIN src/win/*.c)
 
@@ -44,11 +54,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsSt
     target_link_libraries(libuv 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")
+    add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_FREEBSD})
 else() # Assume some Linux variant
     add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX})
 endif()
 
-target_include_directories(libuv PUBLIC ./include PRIVATE ./src)
+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)
 
 if(NOT UV_SKIP_HEADERS)
@@ -59,7 +71,9 @@ if(NOT UV_SKIP_HEADERS)
 endif()
 
 install(TARGETS libuv
+    EXPORT libuv
     RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib
 )
+install(EXPORT libuv FILE unofficial-libuv-targets.cmake NAMESPACE unofficial::libuv:: DESTINATION share/unofficial-libuv)
diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL
index 5d9f3607f..611be7070 100644
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@@ -1,3 +1,3 @@
 Source: libuv
-Version: 1.23.0
+Version: 1.25.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 29741433c..8179c28bb 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.23.0
-    SHA512 d1622ea9c03661ce2dfa18e1725fc1bfdf3b16d7e40babc552dcc5b2f86d52f4dd81cac9bf89914024b11e4ed3671264dfcfba867cfa3b1a2206b89c59c95851
+    REF v1.25.0
+    SHA512 d1024f9193e2ad69cc670441b74ff7c63ca7d295e9a7a43c90da6781a39352687465bfe7e852d6e9085c21821bf8d11c10139c7229759fdce567d809c605acfd
     HEAD_REF v1.x
 )
 
@@ -18,8 +18,15 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libuv TARGET_PATH share/unofficial-libuv)
 vcpkg_copy_pdbs()
 
+configure_file(
+    ${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake
+    ${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake
+    @ONLY
+)
+
 file(READ ${CURRENT_PACKAGES_DIR}/include/uv.h UV_H)
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     string(REPLACE "defined(USING_UV_SHARED)" "1" UV_H "${UV_H}")
diff --git a/ports/libuv/unofficial-libuv-config.in.cmake b/ports/libuv/unofficial-libuv-config.in.cmake
new file mode 100644
index 000000000..7ff66b12c
--- /dev/null
+++ b/ports/libuv/unofficial-libuv-config.in.cmake
@@ -0,0 +1,7 @@
+

+if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32)

+    include(CMakeFindDependencyMacro)

+    find_dependency(Threads)

+endif()

+

+include(${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-targets.cmake)