Revert "Fix readline not found on windows and linux"

This reverts commit 153b925f6b.
This commit is contained in:
jcktm 2018-08-15 14:46:13 +10:00
parent 7cf86f93b9
commit 4f5159c90a
2 changed files with 3 additions and 5 deletions

View File

@ -34,8 +34,6 @@ build:linux:
tags:
- ubuntu
stage: build
before_script:
- apt-get update -qq && apt-get install -y libncurses5-dev libncursesw5-dev
script:
# print our runner distro
- cat /proc/version

View File

@ -24,8 +24,8 @@
find_path(Readline_ROOT_DIR
NAMES include/readline/readline.h
HINTS ENV READLINE_ROOT_DIR
PATHS /opt/local/ /usr/local/ /usr/ ${CMAKE_FIND_ROOT_PATH}
NO_CMAKE_FIND_ROOT_PATH NO_DEFAULT_PATH
PATHS /opt/local/ /usr/local/ /usr/
NO_DEFAULT_PATH
)
find_path(Readline_INCLUDE_DIR
@ -41,7 +41,7 @@ find_library(Readline_LIBRARY
)
find_library(Termcap_LIBRARY
NAMES tinfo termcap ncursesw ncurses cursesw curses
NAMES ncurses tinfo termcap ncursesw cursesw curses
)
if(Readline_INCLUDE_DIR AND Readline_LIBRARY)