diff options
| -rw-r--r-- | cmake/bison.cmake | 16 | ||||
| -rw-r--r-- | cmake/readline.cmake | 9 |
2 files changed, 21 insertions, 4 deletions
diff --git a/cmake/bison.cmake b/cmake/bison.cmake index b1c2d7393fa..9e01ef3d246 100644 --- a/cmake/bison.cmake +++ b/cmake/bison.cmake @@ -37,13 +37,13 @@ MACRO (RUN_BISON input_yy output_cc output_h) IF(BISON_TOO_OLD) IF(EXISTS ${output_cc} AND EXISTS ${output_h}) SET(BISON_USABLE FALSE) - ENDIF() + ENDIF() ENDIF() IF(BISON_USABLE) ADD_CUSTOM_COMMAND( OUTPUT ${output_cc} ${output_h} - COMMAND bison -y -p MYSQL + COMMAND ${BISON_EXECUTABLE} -y -p MYSQL --output=${output_cc} --defines=${output_h} ${input_yy} @@ -58,7 +58,17 @@ MACRO (RUN_BISON input_yy output_cc output_h) ENDIF() ELSE() # Output files are missing, bail out. - MESSAGE(FATAL_ERROR "Please install bison.") + SET(ERRMSG + "Bison (GNU parser generator) is required to build MySQL." + "Please install bison." + ) + IF(WIN32) + SET(ERRMSG ${ERRMSG} + "You can download bison from http://gnuwin32.sourceforge.net/packages/bison.htm " + "Choose 'Complete package, except sources' installation. We recommend to " + "install bison into a directory without spaces, e.g C:\\GnuWin32.") + ENDIF() + MESSAGE(FATAL_ERROR ${ERRMSG}) ENDIF() ENDIF() ENDMACRO() diff --git a/cmake/readline.cmake b/cmake/readline.cmake index 7661f12cce2..44be0c2196e 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -82,7 +82,14 @@ MACRO (FIND_CURSES) INCLUDE (FindCurses) MARK_AS_ADVANCED(CURSES_CURSES_H_PATH CURSES_FORM_LIBRARY CURSES_HAVE_CURSES_H) IF(NOT CURSES_FOUND) - MESSAGE(FATAL_ERROR "curses library not found") + SET(ERRORMSG "Curses library not found. Please install appropriate package, + remove CMakeCache.txt and rerun cmake.") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(ERRORMSG ${ERRORMSG} + "On Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates " + "it is ncurses-devel.") + ENDIF() + MESSAGE(FATAL_ERROR ${ERRORMSG}) ENDIF() IF(CURSES_HAVE_CURSES_H) |