From: David Knapp Date: Wed, 6 Apr 2016 06:53:00 +0000 (-0700) Subject: Fix ncurses lookup on Arch Linux X-Git-Tag: 0.4.14~112 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=27ee8d8943080a5dd735c9faa47c726604bafdff;p=oweals%2Fminetest.git Fix ncurses lookup on Arch Linux Arch Linux doesn't put it's ncursesw includes inside an ncursesw directory. This script ends up setting USE_CURSES as true, but doesn't pick up any of the headers. https://bugs.archlinux.org/task/13994 --- diff --git a/cmake/Modules/FindNcursesw.cmake b/cmake/Modules/FindNcursesw.cmake index dcb7cdda8..b8c7f78f2 100644 --- a/cmake/Modules/FindNcursesw.cmake +++ b/cmake/Modules/FindNcursesw.cmake @@ -147,6 +147,21 @@ if(CURSES_USE_NCURSESW) set(CURSES_HAVE_NCURSESW_CURSES_H "CURSES_HAVE_NCURSESW_CURSES_H-NOTFOUND") endif() endif() + if(NOT DEFINED CURSES_HAVE_NCURSES_H) + if(EXISTS "${CURSES_INCLUDE_PATH}/ncurses.h") + set(CURSES_HAVE_NCURSES_H "${CURSES_INCLUDE_PATH}/ncurses.h") + else() + set(CURSES_HAVE_NCURSES_H "CURSES_HAVE_NCURSES_H-NOTFOUND") + endif() + endif() + if(NOT DEFINED CURSES_HAVE_CURSES_H) + if(EXISTS "${CURSES_INCLUDE_PATH}/curses.h") + set(CURSES_HAVE_CURSES_H "${CURSES_INCLUDE_PATH}/curses.h") + else() + set(CURSES_HAVE_CURSES_H "CURSES_HAVE_CURSES_H-NOTFOUND") + endif() + endif() + find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}" DOC "Path to libform.so or .lib or .a")