1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 22:57:45 +00:00

travis build crap

This commit is contained in:
Tahir Akhlaq 2017-08-09 17:49:09 +01:00
parent 80ac11839b
commit e7ab2f0327
3 changed files with 13 additions and 4 deletions

View file

@ -1,9 +1,15 @@
language: c++
sudo: enabled
before_install:
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo add-apt-repository universe
- sudo apt-get update
- sudo apt-get install libboost-all-dev libmysqlclient-dev
- sudo apt-get install -y software-properties-common
- sudo apt-get update
- sudo apt-get install gcc-4.9 g++-4.9 gcc-4.9-multilib g++-4.9-multilib
- sudo apt-get remove 'libboost.*'
- sudo apt-get remove 'libmysqlclient.*'
- sudo apt-get install libboost-dev:i386 libboost-all-dev:i386 libmysqlclient-dev:i386
compiler:
- gcc
@ -26,4 +32,4 @@ install:
script:
- mkdir build
- cd build
- ${DEPS_DIR}/cmake/bin/cmake .. && make
- ${DEPS_DIR}/cmake/bin/cmake .. -DSAPPHIRE_BOOST_VER="1.54.0" -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_C_COMPILER=gcc-4.9 && make

View file

@ -12,7 +12,10 @@ set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
set(Boost_COMPILER "-vc140")
endif()
set(SAPPHIRE_BOOST_VER 1.60.0)
if(NOT SAPPHIRE_BOOST_VER)
set(SAPPHIRE_BOOST_VER 1.60.0)
endif()
set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
include_directories("${PROJECT_INCLUDE_DIR}")

@ -1 +1 @@
Subproject commit 82031213238a40cc92bc709d81413dd53f2e7a3b
Subproject commit 278556fc80472b87810348bfc2b988ae10a997c1