From e7ab2f0327cebee8f2f8dd6d1998ce9ae1519fc5 Mon Sep 17 00:00:00 2001 From: Tahir Akhlaq Date: Wed, 9 Aug 2017 17:49:09 +0100 Subject: [PATCH] travis build crap --- .travis.yml | 10 ++++++++-- CMakeLists.txt | 5 ++++- src/libraries | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9cfb8675..d7849b63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 \ No newline at end of file + - ${DEPS_DIR}/cmake/bin/cmake .. -DSAPPHIRE_BOOST_VER="1.54.0" -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_C_COMPILER=gcc-4.9 && make \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index bf07950c..c7ecee17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") diff --git a/src/libraries b/src/libraries index 82031213..278556fc 160000 --- a/src/libraries +++ b/src/libraries @@ -1 +1 @@ -Subproject commit 82031213238a40cc92bc709d81413dd53f2e7a3b +Subproject commit 278556fc80472b87810348bfc2b988ae10a997c1