diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-09 19:03:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-09 19:03:05 +0200 |
| commit | ae3cc4f1b7530da66ff1f65d4416451446da36a9 (patch) | |
| tree | cdf57d3f4d73a7b5fee979bf699ad3a7c160a011 /cmake/build_configurations | |
| parent | 6b720ae4cb76228accc32c91c2c59eb3aa53b259 (diff) | |
| download | mariadb-git-ae3cc4f1b7530da66ff1f65d4416451446da36a9.tar.gz | |
MDEV-6561 libedit detection is broken
fix readline/libedit detection:
* search in readline/, editline/ and edit/readline/
* fix typos CMAKE_REQUIRES_LIBRARIES -> CMAKE_REQUIRED_LIBRARIES
* use correct libedit API
* use different cmake variables for libedit and readline
Diffstat (limited to 'cmake/build_configurations')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index d64e60736e5..97e03f5d80d 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -121,12 +121,6 @@ ENDIF() IF(UNIX) SET(WITH_EXTRA_CHARSETS all CACHE STRING "") - IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") - OPTION(WITH_READLINE "" ON) - ELSE() - OPTION(WITH_LIBEDIT "" ON) - ENDIF() - IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") |