From 58b299ee60d62386a2339dab3f99d30570b33085 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Sun, 14 Feb 2021 16:15:20 +0100 Subject: [PATCH] Updated to libuv 1.41 (close #237). uv_socketpair and uv_pipe aren't explicitly eported via uwv. --- CMakeLists.txt | 9 ++------- LICENSE | 2 +- README.md | 4 ++-- conanfile.py | 2 +- test/fake.cpp | 3 +-- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23dcd7de..254e7df2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ endif() # Project configuration # set(UVW_VERSION_MAJOR 2) -set(UVW_VERSION_MINOR 8) +set(UVW_VERSION_MINOR 9) set(UVW_VERSION_PATCH 0) project( @@ -31,11 +31,6 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Debug) endif() -message("*") -message("* ${PROJECT_NAME} v${PROJECT_VERSION} (${CMAKE_BUILD_TYPE})") -message("* Copyright (c) 2016-2020 Michele Caini ") -message("*") - option(USE_LIBCPP "Use libc++ by adding -stdlib=libc++ flag if availbale." ON) option(USE_ASAN "Use address sanitizer by adding -fsanitize=address -fno-omit-frame-pointer flags" OFF) option(USE_UBSAN "Use address sanitizer by adding -fsanitize=undefined -fno-sanitize-recover=all -fno-omit-frame-pointer flags" OFF) @@ -73,7 +68,7 @@ function(fetch_libuv) FetchContent_Declare( libuv GIT_REPOSITORY https://github.com/libuv/libuv.git - GIT_TAG v1.40.0 + GIT_TAG v1.41.0 GIT_SHALLOW 1 ) diff --git a/LICENSE b/LICENSE index 727a9717..f61b0e29 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2020 Michele Caini +Copyright (c) 2016-2021 Michele Caini Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 2f4dad34..802f109d 100644 --- a/README.md +++ b/README.md @@ -436,8 +436,8 @@ who has partecipated so far. # License -Code and documentation Copyright (c) 2016-2020 Michele Caini.
-Logo Copyright (c) 2018-2020 Richard Caseres. +Code and documentation Copyright (c) 2016-2021 Michele Caini.
+Logo Copyright (c) 2018-2021 Richard Caseres. Code released under [the MIT license](https://github.com/skypjack/uvw/blob/master/LICENSE). diff --git a/conanfile.py b/conanfile.py index 3e5d5d4d..2a4021ca 100644 --- a/conanfile.py +++ b/conanfile.py @@ -14,7 +14,7 @@ class UVMConan(ConanFile): exports = "LICENSE" exports_sources = "src/*" no_copy_source = True - requires = "libuv/1.40.0@bincrafters/stable" + requires = "libuv/1.41.0@bincrafters/stable" def package(self): self.copy(pattern="LICENSE", dst="licenses") diff --git a/test/fake.cpp b/test/fake.cpp index c3eb25c5..cc1e1d81 100644 --- a/test/fake.cpp +++ b/test/fake.cpp @@ -3,7 +3,6 @@ extern "C" int fake_func(double *); int fake_func(double *d) { - if (d) - *d = -*d; + if(d) { *d = -*d; } return -42; }