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

3 files changed, 71 insertions, 17 deletions

diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt
index 87c0a6c95..c4b7c3882 100644
--- a/ports/libuv/CMakeLists.txt
+++ b/ports/libuv/CMakeLists.txt
@@ -2,25 +2,76 @@ cmake_minimum_required(VERSION 3.5)
 project(libuv C)
 
 file(GLOB UV_SOURCES_COMMON src/*.c)
+
+file(GLOB UV_SOURCES_UNIX
+    src/unix/async.c
+    src/unix/core.c
+    src/unix/dl.c
+    src/unix/fs.c
+    src/unix/getaddrinfo.c
+    src/unix/getnameinfo.c
+    src/unix/loop.c
+    src/unix/loop-watcher.c
+    src/unix/pipe.c
+    src/unix/poll.c
+    src/unix/process.c
+    src/unix/signal.c
+    src/unix/stream.c
+    src/unix/tcp.c
+    src/unix/thread.c
+    src/unix/tty.c
+    src/unix/udp.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/proctitle.c
+    src/unix/darwin.c
+    src/unix/fsevents.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)
 
-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)
+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)
+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)
 set_target_properties(libuv PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED)
 
 if(NOT UV_SKIP_HEADERS)
-    install(FILES
-        include/tree.h
-        include/uv.h
-        include/uv-version.h
-        include/uv-errno.h
-        include/uv-threadpool.h
-        include/uv-win.h
-        DESTINATION include)
+    install(
+        DIRECTORY include/
+        DESTINATION include
+    )
 endif()
+
 install(TARGETS libuv
     RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib)
+    LIBRARY DESTINATION lib
+)
diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL
index e861df239..e90eaa545 100644
--- a/ports/libuv/CONTROL
+++ b/ports/libuv/CONTROL
@@ -1,3 +1,3 @@
 Source: libuv
-Version: 1.20.0
+Version: 1.24.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 46ce33d8d..782d946c3 100644
--- a/ports/libuv/portfile.cmake
+++ b/ports/libuv/portfile.cmake
@@ -1,10 +1,12 @@
 include(vcpkg_common_functions)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libuv/libuv
-    REF v1.20.0
-    SHA512 382309cb6e54765b956b03357cb754f49d93505ba0e0122a77f33efca07d7b87966c993a5fd9f9503edd1bcd0f49ca42bd9cd9264cce94c847aebca77d237ba0
-    HEAD_REF v1.x)
+    REF v1.24.0
+    SHA512 b75dac19e99497b059b9b8ce646266c4fa10f1259f5fd74554f7f614f7b70f4b62b9c756316d9a3eed6cf6b9d61f5acde9f6eedb88d30431f6a5c87169487ec6
+    HEAD_REF v1.x
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
@@ -12,7 +14,8 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS_DEBUG
-        -DUV_SKIP_HEADERS=ON)
+        -DUV_SKIP_HEADERS=ON
+)
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()