Commit b51195d6 authored by vladislav vaintroub's avatar vladislav vaintroub

CMake 2.6.2 fix

parent 4da913b5
...@@ -197,13 +197,17 @@ MACRO (MYSQL_CHECK_READLINE) ...@@ -197,13 +197,17 @@ MACRO (MYSQL_CHECK_READLINE)
# Handle mutual exclusion of WITH_READLINE/WITH_LIBEDIT variables # Handle mutual exclusion of WITH_READLINE/WITH_LIBEDIT variables
# We save current setting to recognize when user switched between # We save current setting to recognize when user switched between
# WITH_READLINE and WITH_LIBEDIT # WITH_READLINE and WITH_LIBEDIT
IF(WITH_READLINE AND (SAVE_READLINE_SETTING MATCHES "WITH_LIBEDIT" IF(WITH_READLINE)
OR NOT SAVE_READLINE_SETTING)) IF(NOT SAVE_READLINE_SETTING OR SAVE_READLINE_SETTING MATCHES
"WITH_LIBEDIT")
SET(WITH_LIBEDIT OFF CACHE BOOL "Use bundled libedit" FORCE) SET(WITH_LIBEDIT OFF CACHE BOOL "Use bundled libedit" FORCE)
ELSEIF(WITH_LIBEDIT AND (SAVE_READLINE_SETTING MATCHES "WITH_READLINE" ENDIF()
OR NOT SAVE_READLINE_SETTING)) 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) SET(WITH_READLINE OFF CACHE BOOL "Use bundled readline" FORCE)
ENDIF() ENDIF()
ENDIF()
IF(WITH_READLINE) IF(WITH_READLINE)
MYSQL_USE_BUNDLED_READLINE() MYSQL_USE_BUNDLED_READLINE()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment