From ed2818ed89cf475ce71635dfaa24f4b653b08b39 Mon Sep 17 00:00:00 2001 From: An Tao Date: Sat, 24 Oct 2020 14:28:39 +0800 Subject: [PATCH] Find mariadb client library correctly on Ubuntu 20.04 (#613) --- .travis.yml | 6 +++--- cmake_modules/FindMySQL.cmake | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fbd29124..5f8597ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ matrix: - os: linux dist: xenial - os: osx - osx_image: xcode11.2 + osx_image: xcode12.2 sudo: required @@ -58,13 +58,13 @@ before_script: brew tap homebrew/services; brew services restart postgresql; brew services start mariadb; - sleep 2; + sleep 4; mariadb -e "CREATE USER 'root'@'localhost' IDENTIFIED BY ''"; mariadb -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('')"; mariadb -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost'"; mariadb -e "FLUSH PRIVILEGES"; - sleep 2; brew services restart mariadb; + sleep 4; psql -c 'create user postgres superuser;' postgres; fi diff --git a/cmake_modules/FindMySQL.cmake b/cmake_modules/FindMySQL.cmake index 5d8bbb1c..e6544f6a 100644 --- a/cmake_modules/FindMySQL.cmake +++ b/cmake_modules/FindMySQL.cmake @@ -32,12 +32,16 @@ find_path(MYSQL_INCLUDE_DIRS PATH_SUFFIXES mysql PATHS /usr/include/mysql /usr/local/include/mysql + /usr/include/mariadb + /usr/local/include/mariadb /opt/mysql/mysql/include /opt/mysql/mysql/include/mysql /opt/mysql/include /opt/local/include/mysql5 /usr/local/mysql/include /usr/local/mysql/include/mysql + /usr/local/mariadb/include + /usr/local/mariadb/include/mariadb $ENV{ProgramFiles}/MySQL/*/include $ENV{SystemDrive}/MySQL/*/include)