CMake Changes, NCURSES Tweaks

Remove NCurses FindCurses.cmake file, change lines in Cmakelists
Tweak and Fix a few NCurses Terminal tidbits
This commit is contained in:
lwvmobile
2022-02-21 12:55:20 -05:00
committed by GitHub
parent 2ed2dc36aa
commit fea03a0242
9 changed files with 1130 additions and 32 deletions

View File

@@ -15,21 +15,23 @@ find_package(RTLSDR)
#find_package(Curses)
find_package(Curses REQUIRED) #making this required until I can fix all instances of it being called to ifdef lines
find_package(PULSEAUDIO)
set(CURSES_NEED_WIDE TRUE) #not quite sure where to put this
#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} ${CURSES_LIBRARY})
#remove CURSES from 'required' set up top AFTER switching all commands to ifdef in dsd_main, dsd_framesync, and dsd_ncurses.c
#also, figure out how to make it build for wide character support in Linux Mint etc, like this -- $(ncursesw5-config --cflags --libs)
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} ${CURSES_LIBRARY})
if(Curses_FOUND)
set(CURSES_NEED_WIDE TRUE)
include_directories(SYSTEM ${CURSES_INCLUDE_PATH})
list(APPEND LIBS ${CURSES_LIBRARY})
add_definitions(-DUSE_CURSES)
endif(Curses_FOUND)
#if(Curses_FOUND)
# set(CURSES_NEED_WIDE TRUE)
# include_directories(SYSTEM ${CURSES_INCLUDE_PATH})
# list(APPEND LIBS ${CURSES_LIBRARY})
# add_definitions(-DUSE_CURSES)
#endif(Curses_FOUND)
#going to disable PortAudio, works just fine with padsp in Linux,
#hoping disabling this doesn't break OSX or cygwin, etc builds