From b2505fd660fb019b6e4de6c99c309a4c825432ff Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Sun, 18 Jan 2015 06:24:51 +0200 Subject: [PATCH] Fix to bug 683: http://bugs.mariadb.com/show_bug.cgi?id=683 Added a check for MySQL version and a warning for the user about versions older than 5.5.40. --- FindMySQLConfig.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/FindMySQLConfig.cmake b/FindMySQLConfig.cmake index a20e6dc47..377ea2912 100644 --- a/FindMySQLConfig.cmake +++ b/FindMySQLConfig.cmake @@ -2,12 +2,19 @@ # The following variables are set: # MYSQLCONFIG_FOUND - System has MySQL and the tool was found # MYSQLCONFIG_EXECUTABLE - The MySQL configuration tool executable +# MYSQL_VERSION - The MySQL version number find_program(MYSQLCONFIG_EXECUTABLE mysql_config) if(MYSQLCONFIG_EXECUTABLE MATCHES "MYSQLCONFIG_EXECUTABLE-NOTFOUND") message(FATAL_ERROR "Cannot find mysql_config.") set(MYSQLCONFIG_FOUND FALSE CACHE INTERNAL "") unset(MYSQLCONFIG_EXECUTABLE) else() + execute_process(COMMAND ${MYSQLCONFIG_EXECUTABLE} --version OUTPUT_VARIABLE MYSQL_VERSION) + string(REPLACE "\n" "" MYSQL_VERSION ${MYSQL_VERSION}) message(STATUS "mysql_config found: ${MYSQLCONFIG_EXECUTABLE}") + message(STATUS "MySQL version: ${MYSQL_VERSION}") + if(MYSQL_VERSION VERSION_LESS 5.5.40) + message(WARNING "Required MySQL version is 5.5.40 or greater.") + endif() set(MYSQLCONFIG_FOUND TRUE CACHE INTERNAL "") endif()