pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00
Code Activity

gui: fix wide ncurses header on FreeBSD (issue #1343)

Browse Source
This commit is contained in:
Simmo Saan
2019-05-13 13:48:39 +00:00
parent 5910bcf3c8
commit 980d26956f
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/FindNcurses.cmake
+16 -4
View File
@@ -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)
src/gui/curses/gui-curses.h
+1
View File
@@ -25,6 +25,7 @@
#ifdef WEECHAT_HEADLESS
#include "ncurses-fake.h"
#else
#define NCURSES_WIDECHAR 1
#ifdef HAVE_NCURSESW_CURSES_H
#include <ncursesw/ncurses.h>
#elif HAVE_NCURSES_H