From 74d8cf281c469a71b113b88833b52a6a490ec4ef Mon Sep 17 00:00:00 2001 From: patrick96 Date: Wed, 17 Feb 2021 20:43:35 +0100 Subject: [PATCH] cmake: Fix FindLibUV --- cmake/libpoly.cmake | 4 ++-- cmake/modules/FindLibUV.cmake | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/libpoly.cmake b/cmake/libpoly.cmake index f30662a4..0b759f38 100644 --- a/cmake/libpoly.cmake +++ b/cmake/libpoly.cmake @@ -48,6 +48,8 @@ endif() find_package(Threads REQUIRED) find_package(CairoFC REQUIRED) +find_package(LibUV 1.8.0 REQUIRED) + if (ENABLE_ALSA) find_package(ALSA REQUIRED) endif() @@ -98,8 +100,6 @@ endif() find_package(Xcb ${XRANDR_VERSION} REQUIRED COMPONENTS RANDR) find_package(Xcb REQUIRED COMPONENTS ${XORG_EXTENSIONS}) -find_package(LibUV 1.10.0 REQUIRED) - # FreeBSD Support if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") find_package(LibInotify REQUIRED) diff --git a/cmake/modules/FindLibUV.cmake b/cmake/modules/FindLibUV.cmake index a9356ae8..e5e40bb9 100644 --- a/cmake/modules/FindLibUV.cmake +++ b/cmake/modules/FindLibUV.cmake @@ -1,13 +1,13 @@ # This module defines -# LIBUV_FOUND -# LIBUV_INCLUDE_DIR -# LIBUV_INCLUDE_DIRS -# LIBUV_LIBRARY -# LIBUV_LIBRARIES -# LIBUV_VERSION +# LibUV_FOUND +# LibUV_INCLUDE_DIR +# LibUV_INCLUDE_DIRS +# LibUV_LIBRARY +# LibUV_LIBRARIES +# LibUV_VERSION -find_package_impl("libuv" "LIBUV" "") +find_package_impl("libuv" "LibUV" "uv.h") -if(LIBUV_FOUND AND NOT TARGET LibUV::LibUV) - create_imported_target("LibUV::LibUV" "${LIBUV_INCLUDE_DIR}" "${LIBUV_LIBRARY}") +if(LibUV_FOUND AND NOT TARGET LibUV::LibUV) + create_imported_target("LibUV::LibUV" "${LibUV_INCLUDE_DIR}" "${LibUV_LIBRARY}") endif()