Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Duncan Ogilvie
CMake
Commits
84ce4732
Commit
84ce4732
authored
Oct 25, 2019
by
nick black
Committed by
Brad King
Oct 28, 2019
Browse files
FindCurses: use formw when wide support is requested
Fixes: #19883
parent
92780281
Changes
1
Hide whitespace changes
Inline
Side-by-side
Modules/FindCurses.cmake
View file @
84ce4732
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment