Skip to content

cmake/readline.cmake: use pkgconf, if available, to look up system libedit #652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
juchem wants to merge 1 commit into from
+32 −15
Closed

cmake/readline.cmake: use pkgconf, if available, to look up system libedit #652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 32 additions & 15 deletions cmake/readline.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,27 +129,43 @@ MACRO (MYSQL_USE_BUNDLED_EDITLINE)
ENDMACRO()

MACRO (FIND_SYSTEM_EDITLINE)
FIND_PATH(FOUND_EDITLINE_READLINE
NAMES editline/readline.h
)
IF(FOUND_EDITLINE_READLINE)
SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
FIND_PACKAGE(PkgConfig QUIET)
IF(PkgConfig_FOUND)
PKG_CHECK_MODULES(LIBEDIT libedit)
ENDIF()

IF(LIBEDIT_FOUND)
INCLUDE_DIRECTORIES(BEFORE SYSTEM ${EDITLINE_INCLUDE_DIR})
SET(FOUND_EDITLINE_READLINE FOUND)
SET(EDITLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIRS})
IF(BUILD_SHARED_LIBS)
SET(EDITLINE_LIBRARY ${LIBEDIT_LIBRARIES})
ELSE()
SET(EDITLINE_LIBRARY ${LIBEDIT_STATIC_LIBRARIES})
ENDIF()
ELSE()
# Different path on FreeBSD
FIND_PATH(FOUND_EDIT_READLINE_READLINE
NAMES edit/readline/readline.h
FIND_PATH(FOUND_EDITLINE_READLINE
NAMES editline/readline.h
)
IF(FOUND_EDIT_READLINE_READLINE)
SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline")
IF(FOUND_EDITLINE_READLINE)
SET(EDITLINE_INCLUDE_DIR "${FOUND_EDITLINE_READLINE}/editline")
ELSE()
# Different path on FreeBSD
FIND_PATH(FOUND_EDIT_READLINE_READLINE
NAMES edit/readline/readline.h
)
IF(FOUND_EDIT_READLINE_READLINE)
SET(EDITLINE_INCLUDE_DIR "${FOUND_EDIT_READLINE_READLINE}/edit/readline")
ENDIF()
ENDIF()

FIND_LIBRARY(EDITLINE_LIBRARY
NAMES
edit
)
ENDIF()

FIND_LIBRARY(EDITLINE_LIBRARY
NAMES
edit
)
MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY)

MESSAGE(STATUS "EDITLINE_INCLUDE_DIR ${EDITLINE_INCLUDE_DIR}")
MESSAGE(STATUS "EDITLINE_LIBRARY ${EDITLINE_LIBRARY}")

Expand All @@ -160,6 +176,7 @@ MACRO (FIND_SYSTEM_EDITLINE)
SET(CMAKE_REQUIRED_INCLUDES ${EDITLINE_INCLUDE_DIR})
INCLUDE_DIRECTORIES(SYSTEM ${EDITLINE_INCLUDE_DIR})
LIST(APPEND CMAKE_REQUIRED_LIBRARIES ${EDITLINE_LIBRARY})

CHECK_CXX_SOURCE_COMPILES("
#include <stdio.h>
#include <readline.h>
Expand Down