From d4a5f9f77e2001f2f87bd4ff481c6713d855c31c Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Fri, 5 Nov 2021 11:34:22 -0700 Subject: [PATCH] CMake: curses detection with-or-without pkg-config FreeBSD and OpenBSD package maintainers identified failures when pkg-config .pc files not present for curses/ncurses. Patch courtesy of Stuart Henderson. --- cmake/FindCURSES.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/FindCURSES.cmake b/cmake/FindCURSES.cmake index e5d2216bb..8d13a0489 100644 --- a/cmake/FindCURSES.cmake +++ b/cmake/FindCURSES.cmake @@ -58,8 +58,14 @@ if(NCURSES_NOT_FOUND EQUAL -1) set(HAVE_LIBNCURSES 1) set(CURSES_INCLUDE "") - set(CURSES_LIBRARY ${PC_NCurses_LINK_LIBRARIES}) - set(CURSES_VERSION ${PC_NCurses_VERSION}) + if (DEFINED PC_NCurses_LINK_LIBRARIES) + set(CURSES_LIBRARY ${PC_NCurses_LINK_LIBRARIES}) + else() + find_library(CURSES_LIBRARY + NAMES ncurses + PATHS ${PC_NCurses_LIBRARY_DIRS} + ) + endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(CURSES