From ae4c89e5a7876cc3d348e6411fc42b99f8c06fd0 Mon Sep 17 00:00:00 2001
From: Přemysl Janouch
Date: Thu, 14 Jan 2016 20:20:39 +0100
Subject: Try harder to find ncursesw
---
cmake/FindLibEV.cmake | 12 +++++++-----
cmake/FindNcursesw.cmake | 17 +++++++++++++++++
2 files changed, 24 insertions(+), 5 deletions(-)
create mode 100644 cmake/FindNcursesw.cmake
(limited to 'cmake')
diff --git a/cmake/FindLibEV.cmake b/cmake/FindLibEV.cmake
index cdc67dc..e8a1fda 100644
--- a/cmake/FindLibEV.cmake
+++ b/cmake/FindLibEV.cmake
@@ -5,14 +5,16 @@
# Some distributions do add it, though
find_package (PkgConfig REQUIRED)
-pkg_check_modules (LIBEV libev)
+pkg_check_modules (LIBEV QUIET libev)
+set (required_vars LIBEV_LIBRARIES)
if (NOT LIBEV_FOUND)
find_path (LIBEV_INCLUDE_DIRS ev.h)
find_library (LIBEV_LIBRARIES NAMES ev)
-
- if (LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
- set (LIBEV_FOUND TRUE)
- endif (LIBEV_INCLUDE_DIRS AND LIBEV_LIBRARIES)
+ list (APPEND required_vars LIBEV_INCLUDE_DIRS)
endif (NOT LIBEV_FOUND)
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (LIBEV DEFAULT_MSG ${required_vars})
+
+mark_as_advanced (LIBEV_LIBRARIES LIBEV_INCLUDE_DIRS)
diff --git a/cmake/FindNcursesw.cmake b/cmake/FindNcursesw.cmake
new file mode 100644
index 0000000..88c1d01
--- /dev/null
+++ b/cmake/FindNcursesw.cmake
@@ -0,0 +1,17 @@
+# Public Domain
+
+find_package (PkgConfig REQUIRED)
+pkg_check_modules (NCURSESW QUIET ncursesw)
+
+# OpenBSD doesn't provide a pkg-config file
+set (required_vars NCURSESW_LIBRARIES)
+if (NOT NCURSESW_FOUND)
+ find_library (NCURSESW_LIBRARIES NAMES ncursesw)
+ find_path (NCURSESW_INCLUDE_DIRS ncurses.h)
+ list (APPEND required_vars NCURSESW_INCLUDE_DIRS)
+endif (NOT NCURSESW_FOUND)
+
+include (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (NCURSESW DEFAULT_MSG ${required_vars})
+
+mark_as_advanced (NCURSESW_LIBRARIES NCURSESW_INCLUDE_DIRS)
--
cgit v1.2.3-70-g09d2