Merge branch 'master' into Playerbot

apps/ci/mac/ci-compile.sh

@@ -10,12 +10,23 @@ ccache -s
 
 cd var/build/obj
 
+mysql_include_path=$(brew --prefix mysql)/include/mysql
+mysql_lib_path=$(brew --prefix mysql)/lib/libmysqlclient.dylib
+
+if [ ! -d "$mysql_include_path" ]; then
+    echo "Original mysql include directory doesn't exist. Lets try to use the first available folder in mysql dir."
+    base_dir=$(brew --cellar mysql)/$(basename $(ls -d $(brew --cellar mysql)/*/ | head -n 1))
+    echo "Trying the next mysql base dir: $base_dir"
+    mysql_include_path=$base_dir/include/mysql
+    mysql_lib_path=$base_dir/lib/libmysqlclient.dylib
+fi
+
 time cmake ../../../ \
 -DTOOLS_BUILD=all \
 -DSCRIPTS=static \
 -DCMAKE_BUILD_TYPE=Release \
--DMYSQL_ADD_INCLUDE_PATH=/usr/local/include \
--DMYSQL_LIBRARY=/usr/local/lib/libmysqlclient.dylib \
+-DMYSQL_ADD_INCLUDE_PATH=$mysql_include_path \
+-DMYSQL_LIBRARY=$mysql_lib_path \
 -DREADLINE_INCLUDE_DIR=/usr/local/opt/readline/include \
 -DREADLINE_LIBRARY=/usr/local/opt/readline/lib/libreadline.dylib \
 -DOPENSSL_INCLUDE_DIR="$OPENSSL_ROOT_DIR/include" \