diff --git a/cmake/FindNcurses.cmake b/cmake/FindNcurses.cmake index 9531dec31..7c62506ed 100644 --- a/cmake/FindNcurses.cmake +++ b/cmake/FindNcurses.cmake @@ -23,14 +23,22 @@ endif() find_path(NCURSES_INCLUDE_PATH NAMES ncurses.h curses.h - PATHS /usr/include/ncursesw /usr/include/ncurses /usr/include - /usr/local/include/ncursesw /usr/local/include/ncurses /usr/local/include + PATHS /usr/local/include/ncursesw /usr/local/include/ncurses /usr/local/include /usr/pkg/include/ncursesw /usr/pkg/include/ncurses /usr/pkg/include + /usr/include/ncursesw /usr/include/ncurses /usr/include + NO_DEFAULT_PATH +) +find_path(NCURSES_INCLUDE_PATH + NAMES ncurses.h curses.h ) find_library(NCURSESW_LIBRARY NAMES ncursesw - PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib + PATHS /usr/local/lib /usr/pkg/lib /usr/lib /lib + NO_DEFAULT_PATH +) +find_library(NCURSESW_LIBRARY + NAMES ncursesw ) if(NCURSESW_LIBRARY) @@ -43,7 +51,11 @@ if(NCURSESW_LIBRARY) else() find_library(NCURSES_LIBRARY NAMES ncurses - PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib + PATHS /usr/local/lib /usr/pkg/lib /usr/lib /lib + NO_DEFAULT_PATH + ) + find_library(NCURSES_LIBRARY + NAMES ncurses ) find_package(PkgConfig QUIET) if(PKG_CONFIG_FOUND) diff --git a/src/gui/curses/gui-curses.h b/src/gui/curses/gui-curses.h index da536ebfc..de2ac3672 100644 --- a/src/gui/curses/gui-curses.h +++ b/src/gui/curses/gui-curses.h @@ -25,6 +25,7 @@ #ifdef WEECHAT_HEADLESS #include "ncurses-fake.h" #else +#define NCURSES_WIDECHAR 1 #ifdef HAVE_NCURSESW_CURSES_H #include #elif HAVE_NCURSES_H