summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-10-29 14:39:31 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-10-29 14:39:41 (GMT)
commite90f6bacd5e237716dc6e211fe9d22e5e57fd5d8 (patch)
tree384005a1ea1a4add06c0141e0444beee8ea5baff /Modules
parent36516f0a504e586c0b31f64ad373cf355dfc1a88 (diff)
parent84ce47325565b5f1df10fa00f5873a98c6019678 (diff)
downloadCMake-e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8.zip
CMake-e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8.tar.gz
CMake-e90f6bacd5e237716dc6e211fe9d22e5e57fd5d8.tar.bz2
Merge topic 'FindCurses-formw'
84ce473255 FindCurses: use formw when wide support is requested Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3947
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindCurses.cmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index ad40522..e3e7273 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)