From 90957aeea48f2ac80fd7842b58758914b503da42 Mon Sep 17 00:00:00 2001 From: Thad House Date: Thu, 30 May 2019 15:59:26 -0700 Subject: [PATCH] Move libuv to its own subfolder in build (#1661) Allows using system libuv * Fix Gradle Build and include dirs * Update cmake find to support vcpkg libuv --- CMakeLists.txt | 35 +++++- cameraserver/CMakeLists.txt | 5 +- cameraserver/cameraserver-config.cmake | 8 -- cameraserver/cameraserver-config.cmake.in | 8 ++ cscore/CMakeLists.txt | 5 +- cscore/cscore-config.cmake | 6 - cscore/cscore-config.cmake.in | 6 + hal/CMakeLists.txt | 5 +- hal/hal-config.cmake | 5 - hal/hal-config.cmake.in | 5 + ntcore/CMakeLists.txt | 5 +- ntcore/ntcore-config.cmake | 5 - ntcore/ntcore-config.cmake.in | 5 + wpilib-config.cmake.in | 6 +- wpilibc/CMakeLists.txt | 5 +- wpilibc/wpilibc-config.cmake | 10 -- wpilibc/wpilibc-config.cmake.in | 9 ++ wpilibj/CMakeLists.txt | 2 +- wpiutil/CMakeLists.txt | 118 ++++++++++-------- wpiutil/build.gradle | 37 ++++-- .../src/main/native/{ => libuv}/include/uv.h | 0 .../{ => libuv}/include/uv/android-ifaddrs.h | 0 .../main/native/{ => libuv}/include/uv/bsd.h | 0 .../native/{ => libuv}/include/uv/darwin.h | 0 .../native/{ => libuv}/include/uv/errno.h | 0 .../native/{ => libuv}/include/uv/linux.h | 0 .../native/{ => libuv}/include/uv/posix.h | 0 .../{ => libuv}/include/uv/pthread-barrier.h | 0 .../{ => libuv}/include/uv/threadpool.h | 0 .../main/native/{ => libuv}/include/uv/tree.h | 0 .../main/native/{ => libuv}/include/uv/unix.h | 0 .../native/{ => libuv}/include/uv/version.h | 0 .../main/native/{ => libuv}/include/uv/win.h | 0 .../main/native/libuv/{ => src}/fs-poll.cpp | 0 .../main/native/libuv/{ => src}/heap-inl.h | 0 .../src/main/native/libuv/{ => src}/inet.cpp | 0 .../src/main/native/libuv/{ => src}/queue.h | 0 .../native/libuv/{ => src}/threadpool.cpp | 0 .../libuv/{ => src}/unix/android-ifaddrs.cpp | 0 .../native/libuv/{ => src}/unix/async.cpp | 0 .../native/libuv/{ => src}/unix/atomic-ops.h | 0 .../libuv/{ => src}/unix/bsd-ifaddrs.cpp | 0 .../main/native/libuv/{ => src}/unix/core.cpp | 0 .../native/libuv/{ => src}/unix/cygwin.cpp | 0 .../libuv/{ => src}/unix/darwin-proctitle.cpp | 0 .../native/libuv/{ => src}/unix/darwin.cpp | 0 .../main/native/libuv/{ => src}/unix/dl.cpp | 0 .../native/libuv/{ => src}/unix/freebsd.cpp | 0 .../main/native/libuv/{ => src}/unix/fs.cpp | 0 .../native/libuv/{ => src}/unix/fsevents.cpp | 0 .../libuv/{ => src}/unix/getaddrinfo.cpp | 0 .../libuv/{ => src}/unix/getnameinfo.cpp | 0 .../main/native/libuv/{ => src}/unix/ibmi.cpp | 0 .../native/libuv/{ => src}/unix/internal.h | 0 .../native/libuv/{ => src}/unix/kqueue.cpp | 0 .../libuv/{ => src}/unix/linux-core.cpp | 0 .../libuv/{ => src}/unix/linux-inotify.cpp | 0 .../libuv/{ => src}/unix/linux-syscalls.cpp | 0 .../libuv/{ => src}/unix/linux-syscalls.h | 0 .../libuv/{ => src}/unix/loop-watcher.cpp | 0 .../main/native/libuv/{ => src}/unix/loop.cpp | 0 .../native/libuv/{ => src}/unix/netbsd.cpp | 0 .../libuv/{ => src}/unix/no-fsevents.cpp | 0 .../libuv/{ => src}/unix/no-proctitle.cpp | 0 .../native/libuv/{ => src}/unix/openbsd.cpp | 0 .../main/native/libuv/{ => src}/unix/pipe.cpp | 0 .../main/native/libuv/{ => src}/unix/poll.cpp | 0 .../libuv/{ => src}/unix/posix-hrtime.cpp | 0 .../libuv/{ => src}/unix/posix-poll.cpp | 0 .../native/libuv/{ => src}/unix/process.cpp | 0 .../libuv/{ => src}/unix/procfs-exepath.cpp | 0 .../native/libuv/{ => src}/unix/proctitle.cpp | 0 .../libuv/{ => src}/unix/pthread-fixes.cpp | 0 .../native/libuv/{ => src}/unix/signal.cpp | 0 .../native/libuv/{ => src}/unix/spinlock.h | 0 .../native/libuv/{ => src}/unix/stream.cpp | 0 .../libuv/{ => src}/unix/sysinfo-loadavg.cpp | 0 .../libuv/{ => src}/unix/sysinfo-memory.cpp | 0 .../main/native/libuv/{ => src}/unix/tcp.cpp | 0 .../native/libuv/{ => src}/unix/thread.cpp | 0 .../native/libuv/{ => src}/unix/timer.cpp | 0 .../main/native/libuv/{ => src}/unix/tty.cpp | 0 .../main/native/libuv/{ => src}/unix/udp.cpp | 0 .../main/native/libuv/{ => src}/uv-common.cpp | 0 .../main/native/libuv/{ => src}/uv-common.h | 0 .../{ => src}/uv-data-getter-setters.cpp | 0 .../main/native/libuv/{ => src}/version.cpp | 0 .../main/native/libuv/{ => src}/win/async.cpp | 0 .../libuv/{ => src}/win/atomicops-inl.h | 0 .../main/native/libuv/{ => src}/win/core.cpp | 0 .../libuv/{ => src}/win/detect-wakeup.cpp | 0 .../main/native/libuv/{ => src}/win/dl.cpp | 0 .../main/native/libuv/{ => src}/win/error.cpp | 0 .../native/libuv/{ => src}/win/fs-event.cpp | 0 .../main/native/libuv/{ => src}/win/fs.cpp | 0 .../libuv/{ => src}/win/getaddrinfo.cpp | 0 .../libuv/{ => src}/win/getnameinfo.cpp | 0 .../native/libuv/{ => src}/win/handle-inl.h | 0 .../native/libuv/{ => src}/win/handle.cpp | 0 .../native/libuv/{ => src}/win/internal.h | 0 .../libuv/{ => src}/win/loop-watcher.cpp | 0 .../main/native/libuv/{ => src}/win/pipe.cpp | 0 .../main/native/libuv/{ => src}/win/poll.cpp | 0 .../libuv/{ => src}/win/process-stdio.cpp | 0 .../native/libuv/{ => src}/win/process.cpp | 0 .../main/native/libuv/{ => src}/win/req-inl.h | 0 .../main/native/libuv/{ => src}/win/req.cpp | 0 .../native/libuv/{ => src}/win/signal.cpp | 0 .../native/libuv/{ => src}/win/snprintf.cpp | 0 .../native/libuv/{ => src}/win/stream-inl.h | 0 .../native/libuv/{ => src}/win/stream.cpp | 0 .../main/native/libuv/{ => src}/win/tcp.cpp | 0 .../native/libuv/{ => src}/win/thread.cpp | 0 .../main/native/libuv/{ => src}/win/timer.cpp | 0 .../main/native/libuv/{ => src}/win/tty.cpp | 0 .../main/native/libuv/{ => src}/win/udp.cpp | 0 .../main/native/libuv/{ => src}/win/util.cpp | 0 .../native/libuv/{ => src}/win/winapi.cpp | 0 .../main/native/libuv/{ => src}/win/winapi.h | 0 .../native/libuv/{ => src}/win/winsock.cpp | 0 .../main/native/libuv/{ => src}/win/winsock.h | 0 wpiutil/wpiutil-config.cmake | 2 - wpiutil/wpiutil-config.cmake.in | 7 ++ 123 files changed, 183 insertions(+), 116 deletions(-) delete mode 100644 cameraserver/cameraserver-config.cmake create mode 100644 cameraserver/cameraserver-config.cmake.in delete mode 100644 cscore/cscore-config.cmake create mode 100644 cscore/cscore-config.cmake.in delete mode 100644 hal/hal-config.cmake create mode 100644 hal/hal-config.cmake.in delete mode 100644 ntcore/ntcore-config.cmake create mode 100644 ntcore/ntcore-config.cmake.in delete mode 100644 wpilibc/wpilibc-config.cmake create mode 100644 wpilibc/wpilibc-config.cmake.in rename wpiutil/src/main/native/{ => libuv}/include/uv.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/android-ifaddrs.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/bsd.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/darwin.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/errno.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/linux.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/posix.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/pthread-barrier.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/threadpool.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/tree.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/unix.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/version.h (100%) rename wpiutil/src/main/native/{ => libuv}/include/uv/win.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/fs-poll.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/heap-inl.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/inet.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/queue.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/threadpool.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/android-ifaddrs.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/async.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/atomic-ops.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/bsd-ifaddrs.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/core.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/cygwin.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/darwin-proctitle.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/darwin.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/dl.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/freebsd.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/fs.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/fsevents.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/getaddrinfo.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/getnameinfo.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/ibmi.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/internal.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/kqueue.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/linux-core.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/linux-inotify.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/linux-syscalls.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/linux-syscalls.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/loop-watcher.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/loop.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/netbsd.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/no-fsevents.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/no-proctitle.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/openbsd.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/pipe.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/poll.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/posix-hrtime.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/posix-poll.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/process.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/procfs-exepath.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/proctitle.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/pthread-fixes.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/signal.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/spinlock.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/stream.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/sysinfo-loadavg.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/sysinfo-memory.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/tcp.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/thread.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/timer.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/tty.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/unix/udp.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/uv-common.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/uv-common.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/uv-data-getter-setters.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/version.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/async.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/atomicops-inl.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/core.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/detect-wakeup.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/dl.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/error.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/fs-event.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/fs.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/getaddrinfo.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/getnameinfo.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/handle-inl.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/handle.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/internal.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/loop-watcher.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/pipe.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/poll.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/process-stdio.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/process.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/req-inl.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/req.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/signal.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/snprintf.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/stream-inl.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/stream.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/tcp.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/thread.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/timer.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/tty.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/udp.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/util.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/winapi.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/winapi.h (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/winsock.cpp (100%) rename wpiutil/src/main/native/libuv/{ => src}/win/winsock.h (100%) delete mode 100644 wpiutil/wpiutil-config.cmake create mode 100644 wpiutil/wpiutil-config.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index e659add364..20557d78ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,8 @@ option(WITHOUT_CSCORE "Don't build cscore (removes OpenCV requirement)" OFF) option(WITHOUT_ALLWPILIB "Don't build allwpilib (removes OpenCV requirement)" ON) option(USE_EXTERNAL_HAL "Use a separately built HAL" OFF) set(EXTERNAL_HAL_FILE "" CACHE FILEPATH "Location to look for an external HAL CMake File") +option(USE_VCPKG_LIBUV "Use vcpkg libuv" OFF) +option(FLAT_INSTALL_WPILIB "Use a flat install directory" OFF) if (NOT WITHOUT_JAVA AND NOT BUILD_SHARED_LIBS) message(FATAL_ERROR " @@ -65,26 +67,49 @@ set( main_lib_dest wpilib/lib ) set( java_lib_dest wpilib/java ) set( jni_lib_dest wpilib/jni ) -if (MSVC) +if (MSVC OR FLAT_INSTALL_WPILIB) set (wpilib_config_dir ${wpilib_dest}) else() set (wpilib_config_dir share/wpilib) endif() +if (USE_VCPKG_LIBUV) +set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)") +endif() + +if (MSVC OR FLAT_INSTALL_WPILIB) +set(WPIUTIL_DEP_REPLACE "include($\{SELF_DIR\}/wpiutil-config.cmake)") +set(NTCORE_DEP_REPLACE "include($\{SELF_DIR\}/ntcore-config.cmake)") +set(CSCORE_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cscore-config.cmake)") +set(CAMERASERVER_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cameraserver-config.cmake)") +set(HAL_DEP_REPLACE_IMPL "include(\${SELF_DIR}/hal-config.cmake)") +set(WPILIBC_DEP_REPLACE_IMPL "include(\${SELF_DIR}/wpilibc-config.cmake)") +else() +set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)") +set(NTCORE_DEP_REPLACE "find_dependency(ntcore)") +set(CSCORE_DEP_REPLACE_IMPL "find_dependency(cscore)") +set(CAMERASERVER_DEP_REPLACE_IMPL "find_dependency(cameraserver)") +set(HAL_DEP_REPLACE_IMPL "find_dependency(hal)") +set(WPILIBC_DEP_REPLACE_IMPL "find_dependency(wpilibc)") +endif() + +set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)") +set(SELF_DIR "$\{SELF_DIR\}") + add_subdirectory(wpiutil) add_subdirectory(ntcore) if (NOT WITHOUT_CSCORE) + set(CSCORE_DEP_REPLACE ${CSCORE_DEP_REPLACE_IMPL}) + set(CAMERASERVER_DEP_REPLACE ${CAMERASERVER_DEP_REPLACE_IMPL}) add_subdirectory(cscore) add_subdirectory(cameraserver) - set (CSCORE_DEP_REPLACE "find_dependency(cscore)") - set (CAMERASERVER_DEP_REPLACE "find_dependency(cameraserver)") if (NOT WITHOUT_ALLWPILIB) + set(HAL_DEP_REPLACE ${HAL_DEP_REPLACE_IMPL}) + set(WPILIBC_DEP_REPLACE ${WPILIBC_DEP_REPLACE_IMPL}) add_subdirectory(hal) add_subdirectory(wpilibj) add_subdirectory(wpilibc) - set (HAL_DEP_REPLACE "find_dependency(hal)") - set (WPILIBC_DEP_REPLACE "find_dependency(wpilibc)") endif() endif() diff --git a/cameraserver/CMakeLists.txt b/cameraserver/CMakeLists.txt index a3a74607a2..1a75ae48d0 100644 --- a/cameraserver/CMakeLists.txt +++ b/cameraserver/CMakeLists.txt @@ -43,13 +43,14 @@ if (NOT WITHOUT_JAVA AND MSVC) install(TARGETS cameraserver RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) endif() -if (MSVC) +if (MSVC OR FLAT_INSTALL_WPILIB) set (cameraserver_config_dir ${wpilib_dest}) else() set (cameraserver_config_dir share/cameraserver) endif() -install(FILES cameraserver-config.cmake DESTINATION ${cameraserver_config_dir}) +configure_file(cameraserver-config.cmake.in ${CMAKE_BINARY_DIR}/cameraserver-config.cmake ) +install(FILES ${CMAKE_BINARY_DIR}/cameraserver-config.cmake DESTINATION ${cameraserver_config_dir}) install(EXPORT cameraserver DESTINATION ${cameraserver_config_dir}) file(GLOB multiCameraServer_src multiCameraServer/src/main/native/cpp/*.cpp) diff --git a/cameraserver/cameraserver-config.cmake b/cameraserver/cameraserver-config.cmake deleted file mode 100644 index 2c2b1cc33e..0000000000 --- a/cameraserver/cameraserver-config.cmake +++ /dev/null @@ -1,8 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(wpiutil) -find_dependency(ntcore) -find_dependency(cscore) -find_dependency(OpenCV) - -get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${SELF_DIR}/cameraserver.cmake) diff --git a/cameraserver/cameraserver-config.cmake.in b/cameraserver/cameraserver-config.cmake.in new file mode 100644 index 0000000000..301b25bc04 --- /dev/null +++ b/cameraserver/cameraserver-config.cmake.in @@ -0,0 +1,8 @@ +include(CMakeFindDependencyMacro) +@FILENAME_DEP_REPLACE@ +@WPIUTIL_DEP_REPLACE@ +@NTCORE_DEP_REPLACE@ +@CSCORE_DEP_REPLACE@ +find_dependency(OpenCV) + +include(${SELF_DIR}/cameraserver.cmake) diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt index 52bcb54a2b..805b3a5834 100644 --- a/cscore/CMakeLists.txt +++ b/cscore/CMakeLists.txt @@ -36,13 +36,14 @@ set_property(TARGET cscore PROPERTY FOLDER "libraries") install(TARGETS cscore EXPORT cscore DESTINATION "${main_lib_dest}") install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/cscore") -if (MSVC) +if (MSVC OR FLAT_INSTALL_WPILIB) set (cscore_config_dir ${wpilib_dest}) else() set (cscore_config_dir share/cscore) endif() -install(FILES cscore-config.cmake DESTINATION ${cscore_config_dir}) +configure_file(cscore-config.cmake.in ${CMAKE_BINARY_DIR}/cscore-config.cmake ) +install(FILES ${CMAKE_BINARY_DIR}/cscore-config.cmake DESTINATION ${cscore_config_dir}) install(EXPORT cscore DESTINATION ${cscore_config_dir}) SUBDIR_LIST(cscore_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples") diff --git a/cscore/cscore-config.cmake b/cscore/cscore-config.cmake deleted file mode 100644 index 790633b871..0000000000 --- a/cscore/cscore-config.cmake +++ /dev/null @@ -1,6 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(wpiutil) -find_dependency(OpenCV) - -get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${SELF_DIR}/cscore.cmake) diff --git a/cscore/cscore-config.cmake.in b/cscore/cscore-config.cmake.in new file mode 100644 index 0000000000..7894fbaece --- /dev/null +++ b/cscore/cscore-config.cmake.in @@ -0,0 +1,6 @@ +include(CMakeFindDependencyMacro) +@FILENAME_DEP_REPLACE@ +@WPIUTIL_DEP_REPLACE@ +find_dependency(OpenCV) + +include(${SELF_DIR}/cscore.cmake) diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index e52d90ff0e..7394495db3 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -55,13 +55,14 @@ install(TARGETS hal EXPORT hal DESTINATION "${main_lib_dest}") install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/hal") install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen DESTINATION "${include_dest}/hal") -if (MSVC) +if (MSVC OR FLAT_INSTALL_WPILIB) set (hal_config_dir ${wpilib_dest}) else() set (hal_config_dir share/hal) endif() -install(FILES hal-config.cmake DESTINATION ${hal_config_dir}) +configure_file(hal-config.cmake.in ${CMAKE_BINARY_DIR}/hal-config.cmake ) +install(FILES ${CMAKE_BINARY_DIR}/hal-config.cmake DESTINATION ${hal_config_dir}) install(EXPORT hal DESTINATION ${hal_config_dir}) # Java bindings diff --git a/hal/hal-config.cmake b/hal/hal-config.cmake deleted file mode 100644 index 97a574ebf2..0000000000 --- a/hal/hal-config.cmake +++ /dev/null @@ -1,5 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(wpiutil) - -get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${SELF_DIR}/hal.cmake) diff --git a/hal/hal-config.cmake.in b/hal/hal-config.cmake.in new file mode 100644 index 0000000000..ae5533c27d --- /dev/null +++ b/hal/hal-config.cmake.in @@ -0,0 +1,5 @@ +include(CMakeFindDependencyMacro) +@FILENAME_DEP_REPLACE@ +@WPIUTIL_DEP_REPLACE@ + +include(${SELF_DIR}/hal.cmake) diff --git a/ntcore/CMakeLists.txt b/ntcore/CMakeLists.txt index 47e2264012..1c00da1388 100644 --- a/ntcore/CMakeLists.txt +++ b/ntcore/CMakeLists.txt @@ -16,13 +16,14 @@ set_property(TARGET ntcore PROPERTY FOLDER "libraries") install(TARGETS ntcore EXPORT ntcore DESTINATION "${main_lib_dest}") install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/ntcore") -if (MSVC) +if (MSVC OR FLAT_INSTALL_WPILIB) set (ntcore_config_dir ${wpilib_dest}) else() set (ntcore_config_dir share/ntcore) endif() -install(FILES ntcore-config.cmake DESTINATION ${ntcore_config_dir}) +configure_file(ntcore-config.cmake.in ${CMAKE_BINARY_DIR}/ntcore-config.cmake ) +install(FILES ${CMAKE_BINARY_DIR}/ntcore-config.cmake DESTINATION ${ntcore_config_dir}) install(EXPORT ntcore DESTINATION ${ntcore_config_dir}) # Java bindings diff --git a/ntcore/ntcore-config.cmake b/ntcore/ntcore-config.cmake deleted file mode 100644 index 6be1dda4a3..0000000000 --- a/ntcore/ntcore-config.cmake +++ /dev/null @@ -1,5 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(wpiutil) - -get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${SELF_DIR}/ntcore.cmake) diff --git a/ntcore/ntcore-config.cmake.in b/ntcore/ntcore-config.cmake.in new file mode 100644 index 0000000000..1e950e90ce --- /dev/null +++ b/ntcore/ntcore-config.cmake.in @@ -0,0 +1,5 @@ +include(CMakeFindDependencyMacro) +@FILENAME_DEP_REPLACE@ +@WPIUTIL_DEP_REPLACE@ + +include(${SELF_DIR}/ntcore.cmake) diff --git a/wpilib-config.cmake.in b/wpilib-config.cmake.in index 445db82d71..2c15dfe090 100644 --- a/wpilib-config.cmake.in +++ b/wpilib-config.cmake.in @@ -1,8 +1,10 @@ include(CMakeFindDependencyMacro) +@FILENAME_DEP_REPLACE@ set(THREADS_PREFER_PTHREAD_FLAG ON) find_dependency(Threads) -find_dependency(wpiutil) -find_dependency(ntcore) +@LIBUV_VCPKG_REPLACE@ +@WPIUTIL_DEP_REPLACE@ +@NTCORE_DEP_REPLACE@ @CSCORE_DEP_REPLACE@ @CAMERASERVER_DEP_REPLACE@ @HAL_DEP_REPLACE@ diff --git a/wpilibc/CMakeLists.txt b/wpilibc/CMakeLists.txt index da3587188a..7b131838b4 100644 --- a/wpilibc/CMakeLists.txt +++ b/wpilibc/CMakeLists.txt @@ -20,11 +20,12 @@ set_property(TARGET wpilibc PROPERTY FOLDER "libraries") install(TARGETS wpilibc EXPORT wpilibc DESTINATION "${main_lib_dest}") install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpilibc") -if (MSVC) +if (MSVC OR FLAT_INSTALL_WPILIB) set (wpilibc_config_dir ${wpilib_dest}) else() set (wpilibc_config_dir share/wpilibc) endif() -install(FILES wpilibc-config.cmake DESTINATION ${wpilibc_config_dir}) +configure_file(wpilibc-config.cmake.in ${CMAKE_BINARY_DIR}/wpilibc-config.cmake ) +install(FILES ${CMAKE_BINARY_DIR}/wpilibc-config.cmake DESTINATION ${wpilibc_config_dir}) install(EXPORT wpilibc DESTINATION ${wpilibc_config_dir}) diff --git a/wpilibc/wpilibc-config.cmake b/wpilibc/wpilibc-config.cmake deleted file mode 100644 index 86f077c713..0000000000 --- a/wpilibc/wpilibc-config.cmake +++ /dev/null @@ -1,10 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(wpiutil) -find_dependency(ntcore) -find_dependency(cscore) -find_dependency(cameraserver) -find_dependency(hal) -find_dependency(OpenCV) - -get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${SELF_DIR}/wpilibc.cmake) diff --git a/wpilibc/wpilibc-config.cmake.in b/wpilibc/wpilibc-config.cmake.in new file mode 100644 index 0000000000..4332c550e7 --- /dev/null +++ b/wpilibc/wpilibc-config.cmake.in @@ -0,0 +1,9 @@ +include(CMakeFindDependencyMacro) +@FILENAME_DEP_REPLACE@ +@WPIUTIL_DEP_REPLACE@ +@NTCORE_DEP_REPLACE@ +@CSCORE_DEP_REPLACE@ +@CAMERASERVER_DEP_REPLACE@ +@HAL_DEP_REPLACE@ + +include(${SELF_DIR}/wpilibc.cmake) diff --git a/wpilibj/CMakeLists.txt b/wpilibj/CMakeLists.txt index 61fb558fa8..964fa0cc1f 100644 --- a/wpilibj/CMakeLists.txt +++ b/wpilibj/CMakeLists.txt @@ -23,7 +23,7 @@ if (NOT WITHOUT_JAVA) set_property(TARGET wpilibj_jar PROPERTY FOLDER "java") - if (MSVC) + if (MSVC OR FLAT_INSTALL_WPILIB) set (wpilibj_config_dir ${wpilib_dest}) else() set (wpilibj_config_dir share/wpilibj) diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt index ac18ebde64..de66a96713 100644 --- a/wpiutil/CMakeLists.txt +++ b/wpiutil/CMakeLists.txt @@ -28,81 +28,94 @@ GENERATE_RESOURCES(src/main/native/resources generated/main/cpp WPI wpi wpiutil_ file(GLOB_RECURSE wpiutil_native_src src/main/native/cpp/*.cpp) -file(GLOB uv_native_src src/main/native/libuv/*.cpp) +file(GLOB uv_native_src src/main/native/libuv/src/*.cpp) -file(GLOB uv_windows_src src/main/native/libuv/win/*.cpp) +file(GLOB uv_windows_src src/main/native/libuv/src/win/*.cpp) set(uv_unix_src - src/main/native/libuv/unix/async.cpp - src/main/native/libuv/unix/core.cpp - src/main/native/libuv/unix/dl.cpp - src/main/native/libuv/unix/fs.cpp - src/main/native/libuv/unix/getaddrinfo.cpp - src/main/native/libuv/unix/getnameinfo.cpp - src/main/native/libuv/unix/loop-watcher.cpp - src/main/native/libuv/unix/loop.cpp - src/main/native/libuv/unix/pipe.cpp - src/main/native/libuv/unix/poll.cpp - src/main/native/libuv/unix/process.cpp - src/main/native/libuv/unix/signal.cpp - src/main/native/libuv/unix/stream.cpp - src/main/native/libuv/unix/tcp.cpp - src/main/native/libuv/unix/thread.cpp - src/main/native/libuv/unix/timer.cpp - src/main/native/libuv/unix/tty.cpp - src/main/native/libuv/unix/udp.cpp + src/main/native/libuv/src/unix/async.cpp + src/main/native/libuv/src/unix/core.cpp + src/main/native/libuv/src/unix/dl.cpp + src/main/native/libuv/src/unix/fs.cpp + src/main/native/libuv/src/unix/getaddrinfo.cpp + src/main/native/libuv/src/unix/getnameinfo.cpp + src/main/native/libuv/src/unix/loop-watcher.cpp + src/main/native/libuv/src/unix/loop.cpp + src/main/native/libuv/src/unix/pipe.cpp + src/main/native/libuv/src/unix/poll.cpp + src/main/native/libuv/src/unix/process.cpp + src/main/native/libuv/src/unix/signal.cpp + src/main/native/libuv/src/unix/stream.cpp + src/main/native/libuv/src/unix/tcp.cpp + src/main/native/libuv/src/unix/thread.cpp + src/main/native/libuv/src/unix/timer.cpp + src/main/native/libuv/src/unix/tty.cpp + src/main/native/libuv/src/unix/udp.cpp ) set(uv_darwin_src - src/main/native/libuv/unix/bsd-ifaddrs.cpp - src/main/native/libuv/unix/darwin.cpp - src/main/native/libuv/unix/darwin-proctitle.cpp - src/main/native/libuv/unix/fsevents.cpp - src/main/native/libuv/unix/kqueue.cpp - src/main/native/libuv/unix/proctitle.cpp + src/main/native/libuv/src/unix/bsd-ifaddrs.cpp + src/main/native/libuv/src/unix/darwin.cpp + src/main/native/libuv/src/unix/darwin-proctitle.cpp + src/main/native/libuv/src/unix/fsevents.cpp + src/main/native/libuv/src/unix/kqueue.cpp + src/main/native/libuv/src/unix/proctitle.cpp ) set(uv_linux_src - src/main/native/libuv/unix/linux-core.cpp - src/main/native/libuv/unix/linux-inotify.cpp - src/main/native/libuv/unix/linux-syscalls.cpp - src/main/native/libuv/unix/procfs-exepath.cpp - src/main/native/libuv/unix/proctitle.cpp - src/main/native/libuv/unix/sysinfo-loadavg.cpp - src/main/native/libuv/unix/sysinfo-memory.cpp + src/main/native/libuv/src/unix/linux-core.cpp + src/main/native/libuv/src/unix/linux-inotify.cpp + src/main/native/libuv/src/unix/linux-syscalls.cpp + src/main/native/libuv/src/unix/procfs-exepath.cpp + src/main/native/libuv/src/unix/proctitle.cpp + src/main/native/libuv/src/unix/sysinfo-loadavg.cpp + src/main/native/libuv/src/unix/sysinfo-memory.cpp ) -add_library(wpiutil ${wpiutil_native_src} ${uv_native_src} ${wpiutil_resources_src}) +add_library(wpiutil ${wpiutil_native_src} ${wpiutil_resources_src}) set_target_properties(wpiutil PROPERTIES DEBUG_POSTFIX "d") set_property(TARGET wpiutil PROPERTY FOLDER "libraries") -if(NOT MSVC) - target_sources(wpiutil PRIVATE ${uv_unix_src}) - if (APPLE) - target_sources(wpiutil PRIVATE ${uv_darwin_src}) - else() - target_sources(wpiutil PRIVATE ${uv_linux_src}) - endif() +if (NOT MSVC) target_compile_options(wpiutil PUBLIC -std=c++14 -Wall -pedantic -Wextra -Wno-unused-parameter) - target_compile_options(wpiutil PRIVATE -D_GNU_SOURCE) else() - target_sources(wpiutil PRIVATE ${uv_windows_src}) target_compile_options(wpiutil PUBLIC -DNOMINMAX) target_compile_options(wpiutil PRIVATE -D_CRT_SECURE_NO_WARNINGS) - if(BUILD_SHARED_LIBS) - target_compile_options(wpiutil PRIVATE -DBUILDING_UV_SHARED) - endif() endif() target_link_libraries(wpiutil Threads::Threads ${CMAKE_DL_LIBS}) + +if (NOT USE_VCPKG_LIBUV) + target_sources(wpiutil PRIVATE ${uv_native_src}) + install(DIRECTORY src/main/native/libuv/include/ DESTINATION "${include_dest}/wpiutil") + target_include_directories(wpiutil PRIVATE + src/main/native/libuv/src) + target_include_directories(wpiutil PUBLIC + $ + $) + if(NOT MSVC) + target_sources(wpiutil PRIVATE ${uv_unix_src}) + if (APPLE) + target_sources(wpiutil PRIVATE ${uv_darwin_src}) + else() + target_sources(wpiutil PRIVATE ${uv_linux_src}) + endif() + target_compile_options(wpiutil PRIVATE -D_GNU_SOURCE) + else() + target_sources(wpiutil PRIVATE ${uv_windows_src}) + if(BUILD_SHARED_LIBS) + target_compile_options(wpiutil PRIVATE -DBUILDING_UV_SHARED) + endif() + endif() +else() + find_package(unofficial-libuv CONFIG REQUIRED) + target_link_libraries(wpiutil unofficial::libuv::libuv) +endif() + target_include_directories(wpiutil PUBLIC $ $) -target_include_directories(wpiutil PRIVATE - src/main/native/libuv - src/main/native/include/uv-private -) install(TARGETS wpiutil EXPORT wpiutil DESTINATION "${main_lib_dest}") install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpiutil") @@ -111,13 +124,14 @@ if (NOT WITHOUT_JAVA AND MSVC) install(TARGETS wpiutil RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) endif() -if (MSVC) +if (MSVC OR FLAT_INSTALL_WPILIB) set (wpiutil_config_dir ${wpilib_dest}) else() set (wpiutil_config_dir share/wpiutil) endif() -install(FILES wpiutil-config.cmake DESTINATION ${wpiutil_config_dir}) +configure_file(wpiutil-config.cmake.in ${CMAKE_BINARY_DIR}/wpiutil-config.cmake ) +install(FILES ${CMAKE_BINARY_DIR}/wpiutil-config.cmake DESTINATION ${wpiutil_config_dir}) install(EXPORT wpiutil DESTINATION ${wpiutil_config_dir}) SUBDIR_LIST(wpiutil_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples") diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle index 2c2cc7fbc4..6b77b39608 100644 --- a/wpiutil/build.gradle +++ b/wpiutil/build.gradle @@ -4,6 +4,7 @@ ext { nativeName = 'wpiutil' devMain = 'edu.wpi.first.wpiutil.DevMain' def generateTask = createGenerateResourcesTask('main', 'WPI', 'wpi', project) + extraSetup = { it.tasks.withType(CppCompile) { dependsOn generateTask @@ -11,11 +12,11 @@ ext { it.sources { libuvCpp(CppSourceSet) { source { - srcDirs 'src/main/native/libuv' + srcDirs 'src/main/native/libuv/src' include '*.cpp' } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/include/uv-private', 'src/main/native/libuv' + srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' } } resourcesCpp(CppSourceSet) { @@ -33,7 +34,7 @@ ext { it.sources { libuvUnixCpp(CppSourceSet) { source { - srcDirs 'src/main/native/libuv/unix' + srcDirs 'src/main/native/libuv/src/unix' includes = [ 'async.cpp', 'core.cpp', @@ -56,7 +57,7 @@ ext { ] } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/include/uv-private', 'src/main/native/libuv' + srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' } } } @@ -68,11 +69,11 @@ ext { it.sources { libuvWindowsCpp(CppSourceSet) { source { - srcDirs 'src/main/native/libuv/win' + srcDirs 'src/main/native/libuv/src/win' include '*.cpp' } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/include/uv-private', 'src/main/native/libuv' + srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' } } } @@ -80,7 +81,7 @@ ext { it.sources { libuvMacCpp(CppSourceSet) { source { - srcDirs 'src/main/native/libuv/unix' + srcDirs 'src/main/native/libuv/src/unix' includes = [ 'bsd-ifaddrs.cpp', 'darwin.cpp', @@ -91,7 +92,7 @@ ext { ] } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/include/uv-private', 'src/main/native/libuv' + srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' } } } @@ -99,7 +100,7 @@ ext { it.sources { libuvLinuxCpp(CppSourceSet) { source { - srcDirs 'src/main/native/libuv/unix' + srcDirs 'src/main/native/libuv/src/unix' includes = [ 'linux-core.cpp', 'linux-inotify.cpp', @@ -111,7 +112,7 @@ ext { ] } exportedHeaders { - srcDirs 'src/main/native/include', 'src/main/native/include/uv-private', 'src/main/native/libuv' + srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' } } } @@ -131,7 +132,23 @@ file("$projectDir/examples").list(new FilenameFilter() { apply from: "${rootDir}/shared/javacpp/setupBuild.gradle" +cppHeadersZip { + from('src/main/native/libuv/include') { + into '/' + } +} + model { + components { + all { + it.sources.each { + it.exportedHeaders { + srcDirs 'src/main/native/include', 'src/main/native/libuv/include', 'src/main/native/libuv/src' + } + } + } + } + // Exports config is a utility to enable exporting all symbols in a C++ library on windows to a DLL. // This removes the need for DllExport on a library. However, the gradle C++ builder has a bug // where some extra symbols are added that cannot be resolved at link time. This configuration diff --git a/wpiutil/src/main/native/include/uv.h b/wpiutil/src/main/native/libuv/include/uv.h similarity index 100% rename from wpiutil/src/main/native/include/uv.h rename to wpiutil/src/main/native/libuv/include/uv.h diff --git a/wpiutil/src/main/native/include/uv/android-ifaddrs.h b/wpiutil/src/main/native/libuv/include/uv/android-ifaddrs.h similarity index 100% rename from wpiutil/src/main/native/include/uv/android-ifaddrs.h rename to wpiutil/src/main/native/libuv/include/uv/android-ifaddrs.h diff --git a/wpiutil/src/main/native/include/uv/bsd.h b/wpiutil/src/main/native/libuv/include/uv/bsd.h similarity index 100% rename from wpiutil/src/main/native/include/uv/bsd.h rename to wpiutil/src/main/native/libuv/include/uv/bsd.h diff --git a/wpiutil/src/main/native/include/uv/darwin.h b/wpiutil/src/main/native/libuv/include/uv/darwin.h similarity index 100% rename from wpiutil/src/main/native/include/uv/darwin.h rename to wpiutil/src/main/native/libuv/include/uv/darwin.h diff --git a/wpiutil/src/main/native/include/uv/errno.h b/wpiutil/src/main/native/libuv/include/uv/errno.h similarity index 100% rename from wpiutil/src/main/native/include/uv/errno.h rename to wpiutil/src/main/native/libuv/include/uv/errno.h diff --git a/wpiutil/src/main/native/include/uv/linux.h b/wpiutil/src/main/native/libuv/include/uv/linux.h similarity index 100% rename from wpiutil/src/main/native/include/uv/linux.h rename to wpiutil/src/main/native/libuv/include/uv/linux.h diff --git a/wpiutil/src/main/native/include/uv/posix.h b/wpiutil/src/main/native/libuv/include/uv/posix.h similarity index 100% rename from wpiutil/src/main/native/include/uv/posix.h rename to wpiutil/src/main/native/libuv/include/uv/posix.h diff --git a/wpiutil/src/main/native/include/uv/pthread-barrier.h b/wpiutil/src/main/native/libuv/include/uv/pthread-barrier.h similarity index 100% rename from wpiutil/src/main/native/include/uv/pthread-barrier.h rename to wpiutil/src/main/native/libuv/include/uv/pthread-barrier.h diff --git a/wpiutil/src/main/native/include/uv/threadpool.h b/wpiutil/src/main/native/libuv/include/uv/threadpool.h similarity index 100% rename from wpiutil/src/main/native/include/uv/threadpool.h rename to wpiutil/src/main/native/libuv/include/uv/threadpool.h diff --git a/wpiutil/src/main/native/include/uv/tree.h b/wpiutil/src/main/native/libuv/include/uv/tree.h similarity index 100% rename from wpiutil/src/main/native/include/uv/tree.h rename to wpiutil/src/main/native/libuv/include/uv/tree.h diff --git a/wpiutil/src/main/native/include/uv/unix.h b/wpiutil/src/main/native/libuv/include/uv/unix.h similarity index 100% rename from wpiutil/src/main/native/include/uv/unix.h rename to wpiutil/src/main/native/libuv/include/uv/unix.h diff --git a/wpiutil/src/main/native/include/uv/version.h b/wpiutil/src/main/native/libuv/include/uv/version.h similarity index 100% rename from wpiutil/src/main/native/include/uv/version.h rename to wpiutil/src/main/native/libuv/include/uv/version.h diff --git a/wpiutil/src/main/native/include/uv/win.h b/wpiutil/src/main/native/libuv/include/uv/win.h similarity index 100% rename from wpiutil/src/main/native/include/uv/win.h rename to wpiutil/src/main/native/libuv/include/uv/win.h diff --git a/wpiutil/src/main/native/libuv/fs-poll.cpp b/wpiutil/src/main/native/libuv/src/fs-poll.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/fs-poll.cpp rename to wpiutil/src/main/native/libuv/src/fs-poll.cpp diff --git a/wpiutil/src/main/native/libuv/heap-inl.h b/wpiutil/src/main/native/libuv/src/heap-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/heap-inl.h rename to wpiutil/src/main/native/libuv/src/heap-inl.h diff --git a/wpiutil/src/main/native/libuv/inet.cpp b/wpiutil/src/main/native/libuv/src/inet.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/inet.cpp rename to wpiutil/src/main/native/libuv/src/inet.cpp diff --git a/wpiutil/src/main/native/libuv/queue.h b/wpiutil/src/main/native/libuv/src/queue.h similarity index 100% rename from wpiutil/src/main/native/libuv/queue.h rename to wpiutil/src/main/native/libuv/src/queue.h diff --git a/wpiutil/src/main/native/libuv/threadpool.cpp b/wpiutil/src/main/native/libuv/src/threadpool.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/threadpool.cpp rename to wpiutil/src/main/native/libuv/src/threadpool.cpp diff --git a/wpiutil/src/main/native/libuv/unix/android-ifaddrs.cpp b/wpiutil/src/main/native/libuv/src/unix/android-ifaddrs.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/android-ifaddrs.cpp rename to wpiutil/src/main/native/libuv/src/unix/android-ifaddrs.cpp diff --git a/wpiutil/src/main/native/libuv/unix/async.cpp b/wpiutil/src/main/native/libuv/src/unix/async.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/async.cpp rename to wpiutil/src/main/native/libuv/src/unix/async.cpp diff --git a/wpiutil/src/main/native/libuv/unix/atomic-ops.h b/wpiutil/src/main/native/libuv/src/unix/atomic-ops.h similarity index 100% rename from wpiutil/src/main/native/libuv/unix/atomic-ops.h rename to wpiutil/src/main/native/libuv/src/unix/atomic-ops.h diff --git a/wpiutil/src/main/native/libuv/unix/bsd-ifaddrs.cpp b/wpiutil/src/main/native/libuv/src/unix/bsd-ifaddrs.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/bsd-ifaddrs.cpp rename to wpiutil/src/main/native/libuv/src/unix/bsd-ifaddrs.cpp diff --git a/wpiutil/src/main/native/libuv/unix/core.cpp b/wpiutil/src/main/native/libuv/src/unix/core.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/core.cpp rename to wpiutil/src/main/native/libuv/src/unix/core.cpp diff --git a/wpiutil/src/main/native/libuv/unix/cygwin.cpp b/wpiutil/src/main/native/libuv/src/unix/cygwin.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/cygwin.cpp rename to wpiutil/src/main/native/libuv/src/unix/cygwin.cpp diff --git a/wpiutil/src/main/native/libuv/unix/darwin-proctitle.cpp b/wpiutil/src/main/native/libuv/src/unix/darwin-proctitle.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/darwin-proctitle.cpp rename to wpiutil/src/main/native/libuv/src/unix/darwin-proctitle.cpp diff --git a/wpiutil/src/main/native/libuv/unix/darwin.cpp b/wpiutil/src/main/native/libuv/src/unix/darwin.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/darwin.cpp rename to wpiutil/src/main/native/libuv/src/unix/darwin.cpp diff --git a/wpiutil/src/main/native/libuv/unix/dl.cpp b/wpiutil/src/main/native/libuv/src/unix/dl.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/dl.cpp rename to wpiutil/src/main/native/libuv/src/unix/dl.cpp diff --git a/wpiutil/src/main/native/libuv/unix/freebsd.cpp b/wpiutil/src/main/native/libuv/src/unix/freebsd.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/freebsd.cpp rename to wpiutil/src/main/native/libuv/src/unix/freebsd.cpp diff --git a/wpiutil/src/main/native/libuv/unix/fs.cpp b/wpiutil/src/main/native/libuv/src/unix/fs.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/fs.cpp rename to wpiutil/src/main/native/libuv/src/unix/fs.cpp diff --git a/wpiutil/src/main/native/libuv/unix/fsevents.cpp b/wpiutil/src/main/native/libuv/src/unix/fsevents.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/fsevents.cpp rename to wpiutil/src/main/native/libuv/src/unix/fsevents.cpp diff --git a/wpiutil/src/main/native/libuv/unix/getaddrinfo.cpp b/wpiutil/src/main/native/libuv/src/unix/getaddrinfo.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/getaddrinfo.cpp rename to wpiutil/src/main/native/libuv/src/unix/getaddrinfo.cpp diff --git a/wpiutil/src/main/native/libuv/unix/getnameinfo.cpp b/wpiutil/src/main/native/libuv/src/unix/getnameinfo.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/getnameinfo.cpp rename to wpiutil/src/main/native/libuv/src/unix/getnameinfo.cpp diff --git a/wpiutil/src/main/native/libuv/unix/ibmi.cpp b/wpiutil/src/main/native/libuv/src/unix/ibmi.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/ibmi.cpp rename to wpiutil/src/main/native/libuv/src/unix/ibmi.cpp diff --git a/wpiutil/src/main/native/libuv/unix/internal.h b/wpiutil/src/main/native/libuv/src/unix/internal.h similarity index 100% rename from wpiutil/src/main/native/libuv/unix/internal.h rename to wpiutil/src/main/native/libuv/src/unix/internal.h diff --git a/wpiutil/src/main/native/libuv/unix/kqueue.cpp b/wpiutil/src/main/native/libuv/src/unix/kqueue.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/kqueue.cpp rename to wpiutil/src/main/native/libuv/src/unix/kqueue.cpp diff --git a/wpiutil/src/main/native/libuv/unix/linux-core.cpp b/wpiutil/src/main/native/libuv/src/unix/linux-core.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/linux-core.cpp rename to wpiutil/src/main/native/libuv/src/unix/linux-core.cpp diff --git a/wpiutil/src/main/native/libuv/unix/linux-inotify.cpp b/wpiutil/src/main/native/libuv/src/unix/linux-inotify.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/linux-inotify.cpp rename to wpiutil/src/main/native/libuv/src/unix/linux-inotify.cpp diff --git a/wpiutil/src/main/native/libuv/unix/linux-syscalls.cpp b/wpiutil/src/main/native/libuv/src/unix/linux-syscalls.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/linux-syscalls.cpp rename to wpiutil/src/main/native/libuv/src/unix/linux-syscalls.cpp diff --git a/wpiutil/src/main/native/libuv/unix/linux-syscalls.h b/wpiutil/src/main/native/libuv/src/unix/linux-syscalls.h similarity index 100% rename from wpiutil/src/main/native/libuv/unix/linux-syscalls.h rename to wpiutil/src/main/native/libuv/src/unix/linux-syscalls.h diff --git a/wpiutil/src/main/native/libuv/unix/loop-watcher.cpp b/wpiutil/src/main/native/libuv/src/unix/loop-watcher.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/loop-watcher.cpp rename to wpiutil/src/main/native/libuv/src/unix/loop-watcher.cpp diff --git a/wpiutil/src/main/native/libuv/unix/loop.cpp b/wpiutil/src/main/native/libuv/src/unix/loop.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/loop.cpp rename to wpiutil/src/main/native/libuv/src/unix/loop.cpp diff --git a/wpiutil/src/main/native/libuv/unix/netbsd.cpp b/wpiutil/src/main/native/libuv/src/unix/netbsd.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/netbsd.cpp rename to wpiutil/src/main/native/libuv/src/unix/netbsd.cpp diff --git a/wpiutil/src/main/native/libuv/unix/no-fsevents.cpp b/wpiutil/src/main/native/libuv/src/unix/no-fsevents.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/no-fsevents.cpp rename to wpiutil/src/main/native/libuv/src/unix/no-fsevents.cpp diff --git a/wpiutil/src/main/native/libuv/unix/no-proctitle.cpp b/wpiutil/src/main/native/libuv/src/unix/no-proctitle.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/no-proctitle.cpp rename to wpiutil/src/main/native/libuv/src/unix/no-proctitle.cpp diff --git a/wpiutil/src/main/native/libuv/unix/openbsd.cpp b/wpiutil/src/main/native/libuv/src/unix/openbsd.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/openbsd.cpp rename to wpiutil/src/main/native/libuv/src/unix/openbsd.cpp diff --git a/wpiutil/src/main/native/libuv/unix/pipe.cpp b/wpiutil/src/main/native/libuv/src/unix/pipe.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/pipe.cpp rename to wpiutil/src/main/native/libuv/src/unix/pipe.cpp diff --git a/wpiutil/src/main/native/libuv/unix/poll.cpp b/wpiutil/src/main/native/libuv/src/unix/poll.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/poll.cpp rename to wpiutil/src/main/native/libuv/src/unix/poll.cpp diff --git a/wpiutil/src/main/native/libuv/unix/posix-hrtime.cpp b/wpiutil/src/main/native/libuv/src/unix/posix-hrtime.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/posix-hrtime.cpp rename to wpiutil/src/main/native/libuv/src/unix/posix-hrtime.cpp diff --git a/wpiutil/src/main/native/libuv/unix/posix-poll.cpp b/wpiutil/src/main/native/libuv/src/unix/posix-poll.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/posix-poll.cpp rename to wpiutil/src/main/native/libuv/src/unix/posix-poll.cpp diff --git a/wpiutil/src/main/native/libuv/unix/process.cpp b/wpiutil/src/main/native/libuv/src/unix/process.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/process.cpp rename to wpiutil/src/main/native/libuv/src/unix/process.cpp diff --git a/wpiutil/src/main/native/libuv/unix/procfs-exepath.cpp b/wpiutil/src/main/native/libuv/src/unix/procfs-exepath.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/procfs-exepath.cpp rename to wpiutil/src/main/native/libuv/src/unix/procfs-exepath.cpp diff --git a/wpiutil/src/main/native/libuv/unix/proctitle.cpp b/wpiutil/src/main/native/libuv/src/unix/proctitle.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/proctitle.cpp rename to wpiutil/src/main/native/libuv/src/unix/proctitle.cpp diff --git a/wpiutil/src/main/native/libuv/unix/pthread-fixes.cpp b/wpiutil/src/main/native/libuv/src/unix/pthread-fixes.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/pthread-fixes.cpp rename to wpiutil/src/main/native/libuv/src/unix/pthread-fixes.cpp diff --git a/wpiutil/src/main/native/libuv/unix/signal.cpp b/wpiutil/src/main/native/libuv/src/unix/signal.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/signal.cpp rename to wpiutil/src/main/native/libuv/src/unix/signal.cpp diff --git a/wpiutil/src/main/native/libuv/unix/spinlock.h b/wpiutil/src/main/native/libuv/src/unix/spinlock.h similarity index 100% rename from wpiutil/src/main/native/libuv/unix/spinlock.h rename to wpiutil/src/main/native/libuv/src/unix/spinlock.h diff --git a/wpiutil/src/main/native/libuv/unix/stream.cpp b/wpiutil/src/main/native/libuv/src/unix/stream.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/stream.cpp rename to wpiutil/src/main/native/libuv/src/unix/stream.cpp diff --git a/wpiutil/src/main/native/libuv/unix/sysinfo-loadavg.cpp b/wpiutil/src/main/native/libuv/src/unix/sysinfo-loadavg.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/sysinfo-loadavg.cpp rename to wpiutil/src/main/native/libuv/src/unix/sysinfo-loadavg.cpp diff --git a/wpiutil/src/main/native/libuv/unix/sysinfo-memory.cpp b/wpiutil/src/main/native/libuv/src/unix/sysinfo-memory.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/sysinfo-memory.cpp rename to wpiutil/src/main/native/libuv/src/unix/sysinfo-memory.cpp diff --git a/wpiutil/src/main/native/libuv/unix/tcp.cpp b/wpiutil/src/main/native/libuv/src/unix/tcp.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/tcp.cpp rename to wpiutil/src/main/native/libuv/src/unix/tcp.cpp diff --git a/wpiutil/src/main/native/libuv/unix/thread.cpp b/wpiutil/src/main/native/libuv/src/unix/thread.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/thread.cpp rename to wpiutil/src/main/native/libuv/src/unix/thread.cpp diff --git a/wpiutil/src/main/native/libuv/unix/timer.cpp b/wpiutil/src/main/native/libuv/src/unix/timer.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/timer.cpp rename to wpiutil/src/main/native/libuv/src/unix/timer.cpp diff --git a/wpiutil/src/main/native/libuv/unix/tty.cpp b/wpiutil/src/main/native/libuv/src/unix/tty.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/tty.cpp rename to wpiutil/src/main/native/libuv/src/unix/tty.cpp diff --git a/wpiutil/src/main/native/libuv/unix/udp.cpp b/wpiutil/src/main/native/libuv/src/unix/udp.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/unix/udp.cpp rename to wpiutil/src/main/native/libuv/src/unix/udp.cpp diff --git a/wpiutil/src/main/native/libuv/uv-common.cpp b/wpiutil/src/main/native/libuv/src/uv-common.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/uv-common.cpp rename to wpiutil/src/main/native/libuv/src/uv-common.cpp diff --git a/wpiutil/src/main/native/libuv/uv-common.h b/wpiutil/src/main/native/libuv/src/uv-common.h similarity index 100% rename from wpiutil/src/main/native/libuv/uv-common.h rename to wpiutil/src/main/native/libuv/src/uv-common.h diff --git a/wpiutil/src/main/native/libuv/uv-data-getter-setters.cpp b/wpiutil/src/main/native/libuv/src/uv-data-getter-setters.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/uv-data-getter-setters.cpp rename to wpiutil/src/main/native/libuv/src/uv-data-getter-setters.cpp diff --git a/wpiutil/src/main/native/libuv/version.cpp b/wpiutil/src/main/native/libuv/src/version.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/version.cpp rename to wpiutil/src/main/native/libuv/src/version.cpp diff --git a/wpiutil/src/main/native/libuv/win/async.cpp b/wpiutil/src/main/native/libuv/src/win/async.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/async.cpp rename to wpiutil/src/main/native/libuv/src/win/async.cpp diff --git a/wpiutil/src/main/native/libuv/win/atomicops-inl.h b/wpiutil/src/main/native/libuv/src/win/atomicops-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/win/atomicops-inl.h rename to wpiutil/src/main/native/libuv/src/win/atomicops-inl.h diff --git a/wpiutil/src/main/native/libuv/win/core.cpp b/wpiutil/src/main/native/libuv/src/win/core.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/core.cpp rename to wpiutil/src/main/native/libuv/src/win/core.cpp diff --git a/wpiutil/src/main/native/libuv/win/detect-wakeup.cpp b/wpiutil/src/main/native/libuv/src/win/detect-wakeup.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/detect-wakeup.cpp rename to wpiutil/src/main/native/libuv/src/win/detect-wakeup.cpp diff --git a/wpiutil/src/main/native/libuv/win/dl.cpp b/wpiutil/src/main/native/libuv/src/win/dl.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/dl.cpp rename to wpiutil/src/main/native/libuv/src/win/dl.cpp diff --git a/wpiutil/src/main/native/libuv/win/error.cpp b/wpiutil/src/main/native/libuv/src/win/error.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/error.cpp rename to wpiutil/src/main/native/libuv/src/win/error.cpp diff --git a/wpiutil/src/main/native/libuv/win/fs-event.cpp b/wpiutil/src/main/native/libuv/src/win/fs-event.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/fs-event.cpp rename to wpiutil/src/main/native/libuv/src/win/fs-event.cpp diff --git a/wpiutil/src/main/native/libuv/win/fs.cpp b/wpiutil/src/main/native/libuv/src/win/fs.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/fs.cpp rename to wpiutil/src/main/native/libuv/src/win/fs.cpp diff --git a/wpiutil/src/main/native/libuv/win/getaddrinfo.cpp b/wpiutil/src/main/native/libuv/src/win/getaddrinfo.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/getaddrinfo.cpp rename to wpiutil/src/main/native/libuv/src/win/getaddrinfo.cpp diff --git a/wpiutil/src/main/native/libuv/win/getnameinfo.cpp b/wpiutil/src/main/native/libuv/src/win/getnameinfo.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/getnameinfo.cpp rename to wpiutil/src/main/native/libuv/src/win/getnameinfo.cpp diff --git a/wpiutil/src/main/native/libuv/win/handle-inl.h b/wpiutil/src/main/native/libuv/src/win/handle-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/win/handle-inl.h rename to wpiutil/src/main/native/libuv/src/win/handle-inl.h diff --git a/wpiutil/src/main/native/libuv/win/handle.cpp b/wpiutil/src/main/native/libuv/src/win/handle.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/handle.cpp rename to wpiutil/src/main/native/libuv/src/win/handle.cpp diff --git a/wpiutil/src/main/native/libuv/win/internal.h b/wpiutil/src/main/native/libuv/src/win/internal.h similarity index 100% rename from wpiutil/src/main/native/libuv/win/internal.h rename to wpiutil/src/main/native/libuv/src/win/internal.h diff --git a/wpiutil/src/main/native/libuv/win/loop-watcher.cpp b/wpiutil/src/main/native/libuv/src/win/loop-watcher.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/loop-watcher.cpp rename to wpiutil/src/main/native/libuv/src/win/loop-watcher.cpp diff --git a/wpiutil/src/main/native/libuv/win/pipe.cpp b/wpiutil/src/main/native/libuv/src/win/pipe.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/pipe.cpp rename to wpiutil/src/main/native/libuv/src/win/pipe.cpp diff --git a/wpiutil/src/main/native/libuv/win/poll.cpp b/wpiutil/src/main/native/libuv/src/win/poll.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/poll.cpp rename to wpiutil/src/main/native/libuv/src/win/poll.cpp diff --git a/wpiutil/src/main/native/libuv/win/process-stdio.cpp b/wpiutil/src/main/native/libuv/src/win/process-stdio.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/process-stdio.cpp rename to wpiutil/src/main/native/libuv/src/win/process-stdio.cpp diff --git a/wpiutil/src/main/native/libuv/win/process.cpp b/wpiutil/src/main/native/libuv/src/win/process.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/process.cpp rename to wpiutil/src/main/native/libuv/src/win/process.cpp diff --git a/wpiutil/src/main/native/libuv/win/req-inl.h b/wpiutil/src/main/native/libuv/src/win/req-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/win/req-inl.h rename to wpiutil/src/main/native/libuv/src/win/req-inl.h diff --git a/wpiutil/src/main/native/libuv/win/req.cpp b/wpiutil/src/main/native/libuv/src/win/req.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/req.cpp rename to wpiutil/src/main/native/libuv/src/win/req.cpp diff --git a/wpiutil/src/main/native/libuv/win/signal.cpp b/wpiutil/src/main/native/libuv/src/win/signal.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/signal.cpp rename to wpiutil/src/main/native/libuv/src/win/signal.cpp diff --git a/wpiutil/src/main/native/libuv/win/snprintf.cpp b/wpiutil/src/main/native/libuv/src/win/snprintf.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/snprintf.cpp rename to wpiutil/src/main/native/libuv/src/win/snprintf.cpp diff --git a/wpiutil/src/main/native/libuv/win/stream-inl.h b/wpiutil/src/main/native/libuv/src/win/stream-inl.h similarity index 100% rename from wpiutil/src/main/native/libuv/win/stream-inl.h rename to wpiutil/src/main/native/libuv/src/win/stream-inl.h diff --git a/wpiutil/src/main/native/libuv/win/stream.cpp b/wpiutil/src/main/native/libuv/src/win/stream.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/stream.cpp rename to wpiutil/src/main/native/libuv/src/win/stream.cpp diff --git a/wpiutil/src/main/native/libuv/win/tcp.cpp b/wpiutil/src/main/native/libuv/src/win/tcp.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/tcp.cpp rename to wpiutil/src/main/native/libuv/src/win/tcp.cpp diff --git a/wpiutil/src/main/native/libuv/win/thread.cpp b/wpiutil/src/main/native/libuv/src/win/thread.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/thread.cpp rename to wpiutil/src/main/native/libuv/src/win/thread.cpp diff --git a/wpiutil/src/main/native/libuv/win/timer.cpp b/wpiutil/src/main/native/libuv/src/win/timer.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/timer.cpp rename to wpiutil/src/main/native/libuv/src/win/timer.cpp diff --git a/wpiutil/src/main/native/libuv/win/tty.cpp b/wpiutil/src/main/native/libuv/src/win/tty.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/tty.cpp rename to wpiutil/src/main/native/libuv/src/win/tty.cpp diff --git a/wpiutil/src/main/native/libuv/win/udp.cpp b/wpiutil/src/main/native/libuv/src/win/udp.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/udp.cpp rename to wpiutil/src/main/native/libuv/src/win/udp.cpp diff --git a/wpiutil/src/main/native/libuv/win/util.cpp b/wpiutil/src/main/native/libuv/src/win/util.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/util.cpp rename to wpiutil/src/main/native/libuv/src/win/util.cpp diff --git a/wpiutil/src/main/native/libuv/win/winapi.cpp b/wpiutil/src/main/native/libuv/src/win/winapi.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/winapi.cpp rename to wpiutil/src/main/native/libuv/src/win/winapi.cpp diff --git a/wpiutil/src/main/native/libuv/win/winapi.h b/wpiutil/src/main/native/libuv/src/win/winapi.h similarity index 100% rename from wpiutil/src/main/native/libuv/win/winapi.h rename to wpiutil/src/main/native/libuv/src/win/winapi.h diff --git a/wpiutil/src/main/native/libuv/win/winsock.cpp b/wpiutil/src/main/native/libuv/src/win/winsock.cpp similarity index 100% rename from wpiutil/src/main/native/libuv/win/winsock.cpp rename to wpiutil/src/main/native/libuv/src/win/winsock.cpp diff --git a/wpiutil/src/main/native/libuv/win/winsock.h b/wpiutil/src/main/native/libuv/src/win/winsock.h similarity index 100% rename from wpiutil/src/main/native/libuv/win/winsock.h rename to wpiutil/src/main/native/libuv/src/win/winsock.h diff --git a/wpiutil/wpiutil-config.cmake b/wpiutil/wpiutil-config.cmake deleted file mode 100644 index 91d01a77c8..0000000000 --- a/wpiutil/wpiutil-config.cmake +++ /dev/null @@ -1,2 +0,0 @@ -get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -include(${SELF_DIR}/wpiutil.cmake) diff --git a/wpiutil/wpiutil-config.cmake.in b/wpiutil/wpiutil-config.cmake.in new file mode 100644 index 0000000000..5d71bc1923 --- /dev/null +++ b/wpiutil/wpiutil-config.cmake.in @@ -0,0 +1,7 @@ +include(CMakeFindDependencyMacro) +@FILENAME_DEP_REPLACE@ +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_dependency(Threads) +@LIBUV_VCPKG_REPLACE@ + +include(${SELF_DIR}/wpiutil.cmake)