p
/
termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of one CMake dev warning

This commit is contained in:
Přemysl Eric Janouch 2020-09-14 18:00:31 +02:00
parent 0bfb13655c
commit dd3f77a0aa
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -49,20 +49,20 @@ set (lib_headers
# Project libraries # Project libraries
# We need ncurses for one of the demos, so we're always looking # We need ncurses for one of the demos, so we're always looking
if (NCURSESW_FOUND) if (Ncursesw_FOUND)
include_directories (${NCURSESW_INCLUDE_DIRS}) include_directories (${Ncursesw_INCLUDE_DIRS})
set (curses_libraries ${NCURSESW_LIBRARIES}) set (curses_libraries ${Ncursesw_LIBRARIES})
elseif (CURSES_FOUND) elseif (CURSES_FOUND)
include_directories (${CURSES_INCLUDE_DIR}) include_directories (${CURSES_INCLUDE_DIR})
set (curses_libraries ${CURSES_LIBRARY}) set (curses_libraries ${CURSES_LIBRARY})
endif (NCURSESW_FOUND) endif (Ncursesw_FOUND)
if (unibilium_FOUND) if (unibilium_FOUND)
include_directories (${unibilium_INCLUDE_DIRS}) include_directories (${unibilium_INCLUDE_DIRS})
set (lib_libraries ${unibilium_LIBRARIES}) set (lib_libraries ${unibilium_LIBRARIES})
add_definitions (-DHAVE_UNIBILIUM) add_definitions (-DHAVE_UNIBILIUM)
elseif (curses_libraries) elseif (curses_libraries)
include_directories (${NCURSESW_INCLUDE_DIRS}) include_directories (${Ncursesw_INCLUDE_DIRS})
set (lib_libraries ${curses_libraries}) set (lib_libraries ${curses_libraries})
else (CURSES_FOUND) else (CURSES_FOUND)
message (SEND_ERROR "Unibilium not found, Curses not found") message (SEND_ERROR "Unibilium not found, Curses not found")

18
cmake/FindNcursesw.cmake
View File

@ -1,17 +1,17 @@
# Public Domain # Public Domain
find_package (PkgConfig REQUIRED) find_package (PkgConfig REQUIRED)
pkg_check_modules (NCURSESW QUIET ncursesw) pkg_check_modules (Ncursesw QUIET ncursesw)
# OpenBSD doesn't provide a pkg-config file # OpenBSD doesn't provide a pkg-config file
set (required_vars NCURSESW_LIBRARIES) set (required_vars Ncursesw_LIBRARIES)
if (NOT NCURSESW_FOUND) if (NOT Ncursesw_FOUND)
find_library (NCURSESW_LIBRARIES NAMES ncursesw) find_library (Ncursesw_LIBRARIES NAMES ncursesw)
find_path (NCURSESW_INCLUDE_DIRS ncurses.h) find_path (Ncursesw_INCLUDE_DIRS ncurses.h)
list (APPEND required_vars NCURSESW_INCLUDE_DIRS) list (APPEND required_vars Ncursesw_INCLUDE_DIRS)
endif (NOT NCURSESW_FOUND) endif (NOT Ncursesw_FOUND)
include (FindPackageHandleStandardArgs) include (FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS (NCURSESW DEFAULT_MSG ${required_vars}) FIND_PACKAGE_HANDLE_STANDARD_ARGS (Ncursesw DEFAULT_MSG ${required_vars})
mark_as_advanced (NCURSESW_LIBRARIES NCURSESW_INCLUDE_DIRS) mark_as_advanced (Ncursesw_LIBRARIES Ncursesw_INCLUDE_DIRS)