From d0af81c08dd460bea6cc748ae5536ccbfa2dda76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?=
Date: Mon, 24 Jul 2023 09:14:31 +0200 Subject: [PATCH] Try harder to find ncursesw --- CMakeLists.txt | 10 +++++----- liberty | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 900655e..dd9f71e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,10 +13,10 @@ set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/liberty/cmake) include (AddThreads) find_package (Curses) +find_package (Ncursesw) find_package (PkgConfig REQUIRED) pkg_check_modules (jansson REQUIRED jansson) pkg_check_modules (libssl REQUIRED libssl libcrypto) -pkg_check_modules (ncursesw ncursesw) if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD") # 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) endif () -if (ncursesw_FOUND) - set (project_libraries ${ncursesw_LIBRARIES}) - include_directories (${ncursesw_INCLUDE_DIRS}) - link_directories (${ncursesw_LIBRARY_DIRS}) +if (Ncursesw_FOUND) + set (project_libraries ${Ncursesw_LIBRARIES}) + include_directories (${Ncursesw_INCLUDE_DIRS}) + link_directories (${Ncursesw_LIBRARY_DIRS}) elseif (CURSES_FOUND) set (project_libraries ${CURSES_LIBRARY}) include_directories (${CURSES_INCLUDE_DIR}) diff --git a/liberty b/liberty index d71c47f..7a0cb13 160000 --- a/liberty +++ b/liberty @@ -1 +1 @@ -Subproject commit d71c47f8ce7aecdc4856630e9d73a48912be68c1 +Subproject commit 7a0cb13a1a653f61b0e715f79156046898d0dd1b