diff --git a/.travis.yml b/.travis.yml index 484be1ee..b31ed7de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,22 @@ language: c++ sudo: enabled before_install: - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + - sudo add-apt-repository ppa:chris-lea/libsodium -y - sudo add-apt-repository universe - - sudo apt-get update + - sudo apt-get update - 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 cmake3 -y - sudo apt-get install libboost-dev libboost-all-dev libmysqlclient-dev -y - + - sudo apt-get install libsodium-dev -y + compiler: - gcc - - + # Build steps script: - mkdir build - cd build - cmake .. -DSAPPHIRE_BOOST_VER="1.54.0" -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_C_COMPILER=gcc-4.9 && make -j 3 - cd .. - - bash sql_import.sh \ No newline at end of file + - bash sql_import.sh diff --git a/src/servers/Server_REST/CMakeLists.txt b/src/servers/Server_REST/CMakeLists.txt index eb2722fb..f49d6903 100644 --- a/src/servers/Server_REST/CMakeLists.txt +++ b/src/servers/Server_REST/CMakeLists.txt @@ -92,7 +92,7 @@ set_target_properties(server_rest PROPERTIES ) if (UNIX) - target_link_libraries (server_rest Common xivdat pthread mysqlclient dl z) + target_link_libraries (server_rest Common xivdat pthread mysqlclient dl z sodium) else() target_link_libraries (server_rest Common xivdat libmysql zlib1 libsodium) endif()