p
/
json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

Try harder to find ncursesw

This commit is contained in:
Přemysl Eric Janouch 2023-07-24 09:01:04 +02:00
parent 14c6d285fc
commit cda7e1b1f3
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -13,16 +13,17 @@ if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
endif () endif ()
# For custom modules # For custom modules
set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) set (CMAKE_MODULE_PATH
"${PROJECT_SOURCE_DIR}/cmake;${PROJECT_SOURCE_DIR}/liberty/cmake")
# Dependencies # Dependencies
find_package (Curses) find_package (Curses)
find_package (Ncursesw)
find_package (PkgConfig REQUIRED) find_package (PkgConfig REQUIRED)
# Note that cURL can link to a different version of libssl than we do, # Note that cURL can link to a different version of libssl than we do,
# in which case the results are undefined # in which case the results are undefined
pkg_check_modules (dependencies REQUIRED libcurl jansson libssl libcrypto) pkg_check_modules (dependencies REQUIRED libcurl jansson libssl libcrypto)
find_package (LibEV REQUIRED) find_package (LibEV REQUIRED)
pkg_check_modules (ncursesw ncursesw)
set (project_libraries ${dependencies_LIBRARIES} ${LibEV_LIBRARIES}) set (project_libraries ${dependencies_LIBRARIES} ${LibEV_LIBRARIES})
include_directories (${dependencies_INCLUDE_DIRS} ${LibEV_INCLUDE_DIRS}) include_directories (${dependencies_INCLUDE_DIRS} ${LibEV_INCLUDE_DIRS})
@ -42,10 +43,10 @@ elseif (APPLE)
add_definitions (-D_DARWIN_C_SOURCE) add_definitions (-D_DARWIN_C_SOURCE)
endif () endif ()
if (ncursesw_FOUND) if (Ncursesw_FOUND)
list (APPEND project_libraries ${ncursesw_LIBRARIES}) list (APPEND 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)
list (APPEND project_libraries ${CURSES_LIBRARY}) list (APPEND project_libraries ${CURSES_LIBRARY})
include_directories (${CURSES_INCLUDE_DIR}) include_directories (${CURSES_INCLUDE_DIR})

2
liberty

@ -1 +1 @@
Subproject commit 0e86ffe7c30a4d52eea35856b792567ca1040f56 Subproject commit 7a0cb13a1a653f61b0e715f79156046898d0dd1b