kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ncurses-tinfo' 

1f646c6c FindCurses: Detect and satisfy ncurses dependency on tinfo
0e4a2c7e FindCurses: Honor CURSES_NEED_NCURSES when curses is found
This commit is contained in:
Brad King 2014-05-08 11:27:49 -04:00 committed by CMake Topic Stage
parent 159cc31f63 1f646c6ce0
commit d02e58c470
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/FindCurses.cmake
View File

@ -40,7 +40,7 @@ find_library(CURSES_CURSES_LIBRARY NAMES curses )
find_library(CURSES_NCURSES_LIBRARY NAMES ncurses ) find_library(CURSES_NCURSES_LIBRARY NAMES ncurses )
set(CURSES_USE_NCURSES FALSE) set(CURSES_USE_NCURSES FALSE)
if(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY) if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES))
set(CURSES_USE_NCURSES TRUE) set(CURSES_USE_NCURSES TRUE)
endif() endif()
# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html
@ -139,10 +139,20 @@ else()
CACHE FILEPATH "The curses library" ${FORCE_IT}) CACHE FILEPATH "The curses library" ${FORCE_IT})
endif() endif()
CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}"
cbreak "" CURSES_NCURSES_HAS_CBREAK)
if(NOT CURSES_NCURSES_HAS_CBREAK)
find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}")
find_library(CURSES_EXTRA_LIBRARY tinfo )
CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}"
cbreak "" CURSES_TINFO_HAS_CBREAK)
endif()
endif() endif()
find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") if (NOT CURSES_TINFO_HAS_CBREAK)
find_library(CURSES_EXTRA_LIBRARY cur_colr ) find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
find_library(CURSES_EXTRA_LIBRARY cur_colr )
endif()
find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}") find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}")
find_library(CURSES_FORM_LIBRARY form ) find_library(CURSES_FORM_LIBRARY form )
@ -186,5 +196,7 @@ mark_as_advanced(
CURSES_INCLUDE_DIR CURSES_INCLUDE_DIR
CURSES_CURSES_HAS_WSYNCUP CURSES_CURSES_HAS_WSYNCUP
CURSES_NCURSES_HAS_WSYNCUP CURSES_NCURSES_HAS_WSYNCUP
CURSES_NCURSES_HAS_CBREAK
CURSES_TINFO_HAS_CBREAK
) )