This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, master has been updated via e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8 (commit) via 84ce47325565b5f1df10fa00f5873a98c6019678 (commit) from 36516f0a504e586c0b31f64ad373cf355dfc1a88 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8 commit e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8 Merge: 36516f0a50 84ce473255 Author: Brad King <brad.k...@kitware.com> AuthorDate: Tue Oct 29 14:39:31 2019 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Tue Oct 29 10:39:41 2019 -0400 Merge topic 'FindCurses-formw' 84ce473255 FindCurses: use formw when wide support is requested Acked-by: Kitware Robot <kwro...@kitware.com> Merge-request: !3947 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84ce47325565b5f1df10fa00f5873a98c6019678 commit 84ce47325565b5f1df10fa00f5873a98c6019678 Author: nick black <dankamong...@gmail.com> AuthorDate: Fri Oct 25 22:18:10 2019 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Oct 28 12:03:11 2019 -0400 FindCurses: use formw when wide support is requested Fixes: #19883 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) ----------------------------------------------------------------------- Summary of changes: Modules/FindCurses.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits