diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-28 12:04:26 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-28 12:04:26 -0400 |
| commit | ee366b02734210da76a05d2c856283744cd4d13e (patch) | |
| tree | 7a0ed15847a679b371bf6ae418453073c699b3ef | |
| parent | f9193ca2ddfddd3fa9e642866ba3f614bbdbe996 (diff) | |
| parent | 84ce47325565b5f1df10fa00f5873a98c6019678 (diff) | |
| download | cmake-ee366b02734210da76a05d2c856283744cd4d13e.tar.gz | |
Merge branch 'FindCurses-formw' into release-3.16
Merge-request: !3947
| -rw-r--r-- | Modules/FindCurses.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake index ad4052244e..e3e7273be7 100644 --- a/Modules/FindCurses.cmake +++ b/Modules/FindCurses.cmake @@ -51,9 +51,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake) # may be ncursesw if(NOT CURSES_NEED_WIDE) set(NCURSES_LIBRARY_NAME "ncurses") + set(CURSES_FORM_LIBRARY_NAME "form") else() set(NCURSES_LIBRARY_NAME "ncursesw") - # Also, if we are searchig fo wide curses - we are actually searching + set(CURSES_FORM_LIBRARY_NAME "formw") + # Also, if we are searching for wide curses - we are actually searching # for ncurses, we don't know about any other unicode version. set(CURSES_NEED_NCURSES TRUE) endif() @@ -223,8 +225,8 @@ if(NOT CURSES_NEED_WIDE) endif() endif() -find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}") -find_library(CURSES_FORM_LIBRARY form ) +find_library(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" HINTS "${_cursesLibDir}") +find_library(CURSES_FORM_LIBRARY "${CURSES_FORM_LIBRARY_NAME}" ) # Previous versions of FindCurses provided these values. if(NOT DEFINED FORM_LIBRARY) |