From b60e5c85adb597f5a1688de47198175b2747fbd4 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 25 Mar 2017 23:02:20 +0100 Subject: cmake: USE_BUNDLED_X instead of X_USE_BUNDLED (#6357) --- cmake/FindLibUV.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/FindLibUV.cmake') diff --git a/cmake/FindLibUV.cmake b/cmake/FindLibUV.cmake index dcdd5e48b7..3e042e4c50 100644 --- a/cmake/FindLibUV.cmake +++ b/cmake/FindLibUV.cmake @@ -8,7 +8,7 @@ # Set the LIBUV_USE_STATIC variable to specify if static libraries should # be preferred to shared ones. -if(NOT LIBUV_USE_BUNDLED) +if(NOT USE_BUNDLED_LIBUV) find_package(PkgConfig) if (PKG_CONFIG_FOUND) pkg_check_modules(PC_LIBUV QUIET libuv) -- cgit From 53b38251bb0bfdb1d002b09001417e708d85e422 Mon Sep 17 00:00:00 2001 From: Edd Barrett Date: Wed, 3 May 2017 19:16:06 +0100 Subject: build: OpenBSD: libuv does not use KVM, do not link to it. (#6663) --- cmake/FindLibUV.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/FindLibUV.cmake') diff --git a/cmake/FindLibUV.cmake b/cmake/FindLibUV.cmake index 3e042e4c50..3a60a831ea 100644 --- a/cmake/FindLibUV.cmake +++ b/cmake/FindLibUV.cmake @@ -65,7 +65,7 @@ if(HAVE_LIBKSTAT) endif() check_library_exists(kvm kvm_open "kvm.h" HAVE_LIBKVM) -if(HAVE_LIBKVM) +if(HAVE_LIBKVM AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") list(APPEND LIBUV_LIBRARIES kvm) endif() -- cgit