diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-06 15:33:20 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-06 15:33:20 -0400 |
| commit | d9889e002d243c69ce6c374d2ef75a76a831f749 (patch) | |
| tree | c80310753ccb6019dda2e16afc8e1f313cc9b3d8 | |
| parent | 9cb4677509aa767245cbf4bb9e655d1559bc10bd (diff) | |
| parent | 1f646c6ce0766f8ab59868e7cac24034e6966504 (diff) | |
| download | cmake-d9889e002d243c69ce6c374d2ef75a76a831f749.tar.gz | |
Merge branch 'ncurses-tinfo' into release
| -rw-r--r-- | Modules/FindCurses.cmake | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake index 971edb75f3..a453a675dd 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -40,7 +40,7 @@ find_library(CURSES_CURSES_LIBRARY NAMES curses ) find_library(CURSES_NCURSES_LIBRARY NAMES ncurses ) 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) endif() # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html @@ -135,10 +135,20 @@ else() CACHE FILEPATH "The curses library" ${FORCE_IT}) 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() -find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") -find_library(CURSES_EXTRA_LIBRARY cur_colr ) +if (NOT CURSES_TINFO_HAS_CBREAK) + 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 ) @@ -182,5 +192,7 @@ mark_as_advanced( CURSES_INCLUDE_DIR CURSES_CURSES_HAS_WSYNCUP CURSES_NCURSES_HAS_WSYNCUP + CURSES_NCURSES_HAS_CBREAK + CURSES_TINFO_HAS_CBREAK ) |