Skip to content

Commit 3cbb318

Browse files
committed
Merge pull request facebook#2087 from Jo-Con-El/debian-08_disable_libncurses
Disable bogus code for finding and linking against ncurses.
2 parents e49275d + db81840 commit 3cbb318

File tree

3 files changed

+3
-32
lines changed

3 files changed

+3
-32
lines changed

CMake/FindNcurses.cmake

Lines changed: 0 additions & 23 deletions
This file was deleted.

CMake/FindReadline.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# --> BSD licensed
44
#
55
# GNU Readline library finder
6-
if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
6+
if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
77
set(READLINE_FOUND TRUE)
8-
else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
8+
else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
99
FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h
1010
/usr/include/readline
1111
)
@@ -26,4 +26,4 @@ else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
2626
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG READLINE_INCLUDE_DIR READLINE_LIBRARY )
2727

2828
MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
29-
endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
29+
endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)

CMake/HPHPFindLibs.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,6 @@ include_directories(${ONIGURUMA_INCLUDE_DIRS})
291291
find_package(Ldap REQUIRED)
292292
include_directories(${LDAP_INCLUDE_DIR})
293293

294-
# ncurses, readline and history
295-
#set(CURSES_NEED_NCURSES true)
296-
find_package(Ncurses REQUIRED)
297-
include_directories(${NCURSES_INCLUDE_PATH})
298-
299294
# libpthreads
300295
find_package(PThread REQUIRED)
301296
include_directories(${LIBPTHREAD_INCLUDE_DIRS})
@@ -521,7 +516,6 @@ endif()
521516
target_link_libraries(${target} ${EDITLINE_LIBRARIES})
522517
endif()
523518

524-
target_link_libraries(${target} ${NCURSES_LIBRARY})
525519
target_link_libraries(${target} ${CCLIENT_LIBRARY})
526520

527521
target_link_libraries(${target} ${LIBDWARF_LIBRARIES})

0 commit comments

Comments
 (0)