From 7c180113cd663f64eb6a054352c2f118e4466abb Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 23 Feb 2025 22:58:14 +0000 Subject: [PATCH 1/2] CMakeLists.txt: fix build w/ split tinfo Gentoo ships "split tinfo" (with `tinfo` in `libtinfo`). This is fine if pkg-config or similar is used, but FindCurses unfortunately misbehaves (see https://gitlab.kitware.com/cmake/cmake/-/issues/23236). dsd-fme applies the workaround needed for that already since c917c61b85284b18673d49ad8c44879a25ac4baa but `CURSES_LIBRARY` was used instead of `CURSES_LIBRARIES`. Despite the CMake docs only indicating that it's a deprecated alias, `_LIBRARY` indeed only contains some of the needed libraries instead of all. Fix that by using `CURSES_LIBRARIES` instead. Closes: https://github.com/lwvmobile/dsd-fme/issues/276 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51fa2e8..7f9b19e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ find_package(PulseAudio REQUIRED) find_package(CODEC2) include_directories(SYSTEM ${LIBSNDFILE_INCLUDE_DIR} ${MBE_INCLUDE_DIR} ${ITPP_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIRS} ${CURSES_INCLUDE_DIR}) -set(LIBS ${MBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY} ${PULSEAUDIO_SIMPLE_LIBRARY} ${PULSEAUDIO_LIBRARY} ${CURSES_LIBRARY}) +set(LIBS ${MBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY} ${PULSEAUDIO_SIMPLE_LIBRARY} ${PULSEAUDIO_LIBRARY} ${CURSES_LIBRARIES}) if(RTLSDR_FOUND) find_package(Threads) From 13bbf08e6c2c86015a62686503b6e8a14527b90f Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 23 Feb 2025 23:08:24 +0000 Subject: [PATCH 2/2] CMakeLists.txt: further future-proofing of FindCurses use `CURSES_INCLUDE_DIR` -> `CURSES_INCLUDE_DIRS` as `_DIR` is deprecated per the `FindCurses` docs. It shouldn't matter like the `_LIBRARY` issue though as it seems to gracefully populate both with the same value. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f9b19e..e0df712 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ find_package(Curses REQUIRED) find_package(PulseAudio REQUIRED) find_package(CODEC2) -include_directories(SYSTEM ${LIBSNDFILE_INCLUDE_DIR} ${MBE_INCLUDE_DIR} ${ITPP_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIRS} ${CURSES_INCLUDE_DIR}) +include_directories(SYSTEM ${LIBSNDFILE_INCLUDE_DIR} ${MBE_INCLUDE_DIR} ${ITPP_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIRS} ${CURSES_INCLUDE_DIRS}) set(LIBS ${MBE_LIBRARY} ${LIBSNDFILE_LIBRARY} ${ITPP_LIBRARY} ${PULSEAUDIO_SIMPLE_LIBRARY} ${PULSEAUDIO_LIBRARY} ${CURSES_LIBRARIES}) if(RTLSDR_FOUND)