pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Will prefer libmysql(dynamic) over mysqlclient(static) library for linking. Update travis.yml for new travis-ci container types.

Browse Source
This commit is contained in:
KimLS 2015-10-10 22:06:54 -07:00
parent b923c69f39
commit f19648f615
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -1,11 +1,17 @@
language: cpp language: cpp
compiler: gcc compiler: gcc
before_install: sudo: false
- sudo apt-get update -qq addons:
- sudo apt-get install -y libmysqlclient-dev libperl-dev libboost-dev liblua5.1-0-dev zlib1g-dev apt:
packages:
- libmysqlclient-dev
- libperl-dev
- libboost-dev
- liblua5.1-0-dev
- zlib1g-dev
script: script:
- cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON
- make - make -j8
- ./bin/tests - ./bin/tests
branches: branches:
only: only:

2
cmake/FindMySQL.cmake
View File

@ -30,7 +30,7 @@ ELSE(MYSQL_ROOT)
ENDIF(MYSQL_ROOT) ENDIF(MYSQL_ROOT)
# Library # Library
SET(MySQL_NAMES mysqlclient_r mysqlclient) SET(MySQL_NAMES libmysql mysqlclient_r mysqlclient)
IF(MYSQL_ROOT) IF(MYSQL_ROOT)
FIND_LIBRARY(MySQL_LIBRARY_DEBUG FIND_LIBRARY(MySQL_LIBRARY_DEBUG
NAMES ${MySQL_NAMES} NAMES ${MySQL_NAMES}