Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Find mariadb client library correctly on Ubuntu 20.04 (#613)

This commit is contained in:
An Tao 2020-10-24 14:28:39 +08:00 committed by GitHub
parent 17b3ea471d
commit ed2818ed89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -3,7 +3,7 @@ matrix:
- os: linux - os: linux
dist: xenial dist: xenial
- os: osx - os: osx
osx_image: xcode11.2 osx_image: xcode12.2
sudo: required sudo: required
@ -58,13 +58,13 @@ before_script:
brew tap homebrew/services; brew tap homebrew/services;
brew services restart postgresql; brew services restart postgresql;
brew services start mariadb; brew services start mariadb;
sleep 2; sleep 4;
mariadb -e "CREATE USER 'root'@'localhost' IDENTIFIED BY ''"; mariadb -e "CREATE USER 'root'@'localhost' IDENTIFIED BY ''";
mariadb -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('')"; mariadb -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('')";
mariadb -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost'"; mariadb -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost'";
mariadb -e "FLUSH PRIVILEGES"; mariadb -e "FLUSH PRIVILEGES";
sleep 2;
brew services restart mariadb; brew services restart mariadb;
sleep 4;
psql -c 'create user postgres superuser;' postgres; psql -c 'create user postgres superuser;' postgres;
fi fi

4
cmake_modules/FindMySQL.cmake
View File

@ -32,12 +32,16 @@ find_path(MYSQL_INCLUDE_DIRS
PATH_SUFFIXES mysql PATH_SUFFIXES mysql
PATHS /usr/include/mysql PATHS /usr/include/mysql
/usr/local/include/mysql /usr/local/include/mysql
/usr/include/mariadb
/usr/local/include/mariadb
/opt/mysql/mysql/include /opt/mysql/mysql/include
/opt/mysql/mysql/include/mysql /opt/mysql/mysql/include/mysql
/opt/mysql/include /opt/mysql/include
/opt/local/include/mysql5 /opt/local/include/mysql5
/usr/local/mysql/include /usr/local/mysql/include
/usr/local/mysql/include/mysql /usr/local/mysql/include/mysql
/usr/local/mariadb/include
/usr/local/mariadb/include/mariadb
$ENV{ProgramFiles}/MySQL/*/include $ENV{ProgramFiles}/MySQL/*/include
$ENV{SystemDrive}/MySQL/*/include) $ENV{SystemDrive}/MySQL/*/include)