diff options
| author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2008-04-22 09:16:15 +0000 |
|---|---|---|
| committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2008-04-22 09:16:15 +0000 |
| commit | ccea1b4ed51d39d72efa77127d0ebbc10c1ea7fe (patch) | |
| tree | 6b857e2dbe9da0a8feedafcabfd71269677ad794 /cmake | |
| parent | c56899761c2908caab683fa89937860551c8652f (diff) | |
| download | pcre-ccea1b4ed51d39d72efa77127d0ebbc10c1ea7fe.tar.gz | |
CMake patches for readline support to ensure ncurses is linked when required.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@344 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindReadline.cmake | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake index 6899f88..1d4cc55 100644 --- a/cmake/FindReadline.cmake +++ b/cmake/FindReadline.cmake @@ -9,11 +9,21 @@ else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY) FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h /usr/include/readline ) + +# 2008-04-22 The next clause used to read like this: +# +# FIND_LIBRARY(READLINE_LIBRARY NAMES readline) +# FIND_LIBRARY(NCURSES_LIBRARY NAMES ncurses ) +# include(FindPackageHandleStandardArgs) +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG NCURSES_LIBRARY READLINE_INCLUDE_DIR READLINE_LIBRARY ) +# +# I was advised to modify it such that it will find an ncurses library if +# required, but not if one was explicitly given, that is, it allows the +# default to be overridden. PH FIND_LIBRARY(READLINE_LIBRARY NAMES readline) - FIND_LIBRARY(NCURSES_LIBRARY NAMES ncurses ) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG NCURSES_LIBRARY READLINE_INCLUDE_DIR READLINE_LIBRARY ) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG READLINE_INCLUDE_DIR READLINE_LIBRARY ) MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY) endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY) |