diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-15 15:19:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-15 15:19:44 (GMT) |
| commit | c3c751e9ddb06702c9a046ab2c0eda12750d09ed (patch) | |
| tree | 995e3a741a794037993c3685e87461483a45d1d0 | |
| parent | c89794feaeec7c7acd22caee9c20252bfc7b33d9 (diff) | |
| parent | 9fc87ef2e712eda340457811a1e1ac0af3e70bb5 (diff) | |
| download | CMake-c3c751e9ddb06702c9a046ab2c0eda12750d09ed.zip CMake-c3c751e9ddb06702c9a046ab2c0eda12750d09ed.tar.gz CMake-c3c751e9ddb06702c9a046ab2c0eda12750d09ed.tar.bz2 | |
Merge branch 'FindCurses-tinfow' into release-3.16
Merge-request: !3915
| -rw-r--r-- | Modules/FindCurses.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake index 5abc08a..ad40522 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -134,11 +134,13 @@ if(CURSES_USE_NCURSES) endif() if (CURSES_NEED_WIDE) + set(CURSES_TINFO_LIBRARY_NAME tinfow) find_path(CURSES_INCLUDE_PATH NAMES ncursesw/ncurses.h ncursesw/curses.h ncursesw.h cursesw.h HINTS "${_cursesParentDir}/include" ) else() + set(CURSES_TINFO_LIBRARY_NAME tinfo) find_path(CURSES_INCLUDE_PATH NAMES ncurses/ncurses.h ncurses/curses.h ncurses.h curses.h HINTS "${_cursesParentDir}/include" @@ -153,8 +155,8 @@ if(CURSES_USE_NCURSES) 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 ) + find_library(CURSES_EXTRA_LIBRARY "${CURSES_TINFO_LIBRARY_NAME}" HINTS "${_cursesLibDir}") + find_library(CURSES_EXTRA_LIBRARY "${CURSES_TINFO_LIBRARY_NAME}" ) endif() else() get_filename_component(_cursesLibDir "${CURSES_CURSES_LIBRARY}" PATH) |