Fix linking for readline, ncurses. Remove unused

- Remove leftovers from MiniUPnP and Unbound. - Add termcap listing info for ncurses (fixes static linking on mac)
blur-network · Jul 3, 2019 · 10832b8 · 10832b8
1 parent b8dadd2
commit 10832b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 124 deletions.
diff --git a/cmake/FindBerkeleyDB.cmake b/cmake/FindBerkeleyDB.cmake
diff --git a/cmake/FindMiniupnpc.cmake b/cmake/FindMiniupnpc.cmake
diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake
@@ -27,6 +27,12 @@ find_path(Readline_ROOT_DIR
     NO_DEFAULT_PATH
 )
 
+find_path(Termcap_ROOT_DIR
+    NAMES include/curses.h
+    PATHS /usr/local/ /usr/ /opt/local/ /usr/local/opt/ncurses/
+    NO_DEFAULT_PATH
+)
+
 find_path(Readline_INCLUDE_DIR
     NAMES readline/readline.h
     PATHS ${Readline_ROOT_DIR}/include
@@ -41,6 +47,8 @@ find_library(Readline_LIBRARY
 
 find_library(Termcap_LIBRARY
   NAMES tinfo termcap ncursesw ncurses cursesw curses
+  PATHS ${Termcap_ROOT_DIR}/lib
+  NO_DEFAULT_PATH
 )
 
 if(Readline_INCLUDE_DIR AND Readline_LIBRARY)

diff --git a/cmake/FindUnbound.cmake b/cmake/FindUnbound.cmake