Try harder to find ncursesw
This commit is contained in:
parent
cabd2bad9b
commit
d0af81c08d
|
@ -13,10 +13,10 @@ set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/liberty/cmake)
|
||||||
include (AddThreads)
|
include (AddThreads)
|
||||||
|
|
||||||
find_package (Curses)
|
find_package (Curses)
|
||||||
|
find_package (Ncursesw)
|
||||||
find_package (PkgConfig REQUIRED)
|
find_package (PkgConfig REQUIRED)
|
||||||
pkg_check_modules (jansson REQUIRED jansson)
|
pkg_check_modules (jansson REQUIRED jansson)
|
||||||
pkg_check_modules (libssl REQUIRED libssl libcrypto)
|
pkg_check_modules (libssl REQUIRED libssl libcrypto)
|
||||||
pkg_check_modules (ncursesw ncursesw)
|
|
||||||
|
|
||||||
if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
|
if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
|
||||||
# Need this in FreeBSD and OpenBSD respectively;
|
# Need this in FreeBSD and OpenBSD respectively;
|
||||||
|
@ -24,10 +24,10 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
|
||||||
add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
|
add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (ncursesw_FOUND)
|
if (Ncursesw_FOUND)
|
||||||
set (project_libraries ${ncursesw_LIBRARIES})
|
set (project_libraries ${Ncursesw_LIBRARIES})
|
||||||
include_directories (${ncursesw_INCLUDE_DIRS})
|
include_directories (${Ncursesw_INCLUDE_DIRS})
|
||||||
link_directories (${ncursesw_LIBRARY_DIRS})
|
link_directories (${Ncursesw_LIBRARY_DIRS})
|
||||||
elseif (CURSES_FOUND)
|
elseif (CURSES_FOUND)
|
||||||
set (project_libraries ${CURSES_LIBRARY})
|
set (project_libraries ${CURSES_LIBRARY})
|
||||||
include_directories (${CURSES_INCLUDE_DIR})
|
include_directories (${CURSES_INCLUDE_DIR})
|
||||||
|
|
2
liberty
2
liberty
|
@ -1 +1 @@
|
||||||
Subproject commit d71c47f8ce7aecdc4856630e9d73a48912be68c1
|
Subproject commit 7a0cb13a1a653f61b0e715f79156046898d0dd1b
|
Loading…
Reference in New Issue