christoph/fail
1
Fork 0
Code Releases Activity

Debian 10: MySQL/MariaDB related fixes

Browse Source 
Change-Id: I538caf6dedaa785061194a87c7e4965df3839088
This commit is contained in:
Horst Schirmeier
2019-10-21 17:14:01 +02:00
committed by Horst Schirmeier
parent 198a2dde97
commit c34917ca80
15 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmake/FindMySQL.cmake
View File

@ -1,24 +1,26 @@
# Find the MySQL includes and client library
# This module defines
# MYSQL_INCLUDE_DIR, where to find mysql.h
# MYSQL_CFLAGS, contain compiler -I parameters with MySQL/MariaDB headers
# MYSQL_LIBRARIES, the libraries needed to use MySQL.
# MYSQL_FOUND, If false, do not try to use MySQL.
set(MYSQL_CONFIG_PREFER_PATH "$ENV{MYSQL_HOME}/bin" CACHE FILEPATH
"preferred path to MySQL (mysql_config)")
find_program(MYSQL_CONFIG mysql_config
find_program(MYSQL_CONFIG
NAMES mysql_config mariadb_config
${MYSQL_CONFIG_PREFER_PATH}
/usr/local/mysql/bin/
/usr/local/mariadb/bin/
/usr/local/bin/
/usr/bin/
)
if(MYSQL_CONFIG)
message(STATUS "Using mysql_config: ${MYSQL_CONFIG}")
# set INCLUDE_DIR
# set MYSQL_CFLAGS
exec_program(${MYSQL_CONFIG}
ARGS --include
OUTPUT_VARIABLE MYSQL_INCLUDE_DIR)
ARGS --cflags
OUTPUT_VARIABLE MYSQL_CFLAGS)
# set LIBRARY_DIR
exec_program(${MYSQL_CONFIG}
@ -34,6 +36,8 @@ else(MYSQL_CONFIG)
/usr/local/mysql/include/mysql
/usr/include
/usr/include/mysql
/usr/include/mariadb
)
#find_library(mysqlclient_r ...
# PATHS
# ${MYSQL_ADD_LIBRARY_PATH}
@ -42,18 +46,18 @@ else(MYSQL_CONFIG)
# /usr/local/lib/mysql
# /usr/local/mysql/lib
#)
)
set(MYSQL_CFLAGS "-I${MYSQL_INCLUDE_DIR}")
endif(MYSQL_CONFIG)
set(MYSQL_INCLUDE_DIR ${MYSQL_INCLUDE_DIR} CACHE FILEPATH INTERNAL)
set(MYSQL_CFLAGS ${MYSQL_CFLAGS} CACHE FILEPATH INTERNAL)
set(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
if(MYSQL_CFLAGS AND MYSQL_LIBRARIES)
set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")
message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}")
else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
message(STATUS "Found MySQL: ${MYSQL_CFLAGS}, ${MYSQL_LIBRARIES}")
else(MYSQL_CFLAGS AND MYSQL_LIBRARIES)
set(MYSQL_FOUND FALSE CACHE INTERNAL "MySQL found")
message(STATUS "MySQL not found.")
endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
endif(MYSQL_CFLAGS AND MYSQL_LIBRARIES)
mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES)
mark_as_advanced(MYSQL_CFLAGS MYSQL_LIBRARIES)