From b51195d6514994fa7b05d6351ad4da213d34e878 Mon Sep 17 00:00:00 2001 From: vladislav vaintroub Date: Fri, 8 Jan 2010 11:06:42 +0100 Subject: [PATCH] CMake 2.6.2 fix --- cmake/readline.cmake | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cmake/readline.cmake b/cmake/readline.cmake index 548144f8f61..5b6d23fc14e 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -197,12 +197,16 @@ MACRO (MYSQL_CHECK_READLINE) # Handle mutual exclusion of WITH_READLINE/WITH_LIBEDIT variables # We save current setting to recognize when user switched between # WITH_READLINE and WITH_LIBEDIT - IF(WITH_READLINE AND (SAVE_READLINE_SETTING MATCHES "WITH_LIBEDIT" - OR NOT SAVE_READLINE_SETTING)) - SET(WITH_LIBEDIT OFF CACHE BOOL "Use bundled libedit" FORCE) - ELSEIF(WITH_LIBEDIT AND (SAVE_READLINE_SETTING MATCHES "WITH_READLINE" - OR NOT SAVE_READLINE_SETTING)) - SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline" FORCE) + IF(WITH_READLINE) + IF(NOT SAVE_READLINE_SETTING OR SAVE_READLINE_SETTING MATCHES + "WITH_LIBEDIT") + SET(WITH_LIBEDIT OFF CACHE BOOL "Use bundled libedit" FORCE) + ENDIF() + ELSEIF(WITH_LIBEDIT) + IF(NOT SAVE_READLINE_SETTING OR SAVE_READLINE_SETTING MATCHES + "WITH_READLINE") + SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline" FORCE) + ENDIF() ENDIF() IF(WITH_READLINE)