Skip to content
Snippets Groups Projects
Commit c72d3d7b authored by Lars Bilke's avatar Lars Bilke
Browse files

Install also needed boost libraries on travis.

Travis uses Ubuntu 12.04 which ships with Boost 1.46.0. Required
version was lowered therefore.
parent 58bbb725
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ branches: ...@@ -5,7 +5,7 @@ branches:
only: only:
- master - master
before_install: before_install:
- sudo apt-get update; sudo apt-get install qt4-dev-tools libvtk5-dev libvtk5-qt4-dev libnetcdf-dev libshp-dev libgeotiff-dev libboost-dev - sudo apt-get update; sudo apt-get install qt4-dev-tools libvtk5-dev libvtk5-qt4-dev libnetcdf-dev libshp-dev libgeotiff-dev libboost-dev libboost-date-time-dev libboost-filesystem-dev libboost-date-time-dev libboost-filesystem-dev libboost-system-dev
script: "mkdir build && cd build && cmake -DOGS_BUILD_GUI=ON -DOGS_DONT_USE_OPTIONAL_SUBMODULES=ON .. && cmake .. && make && make test" script: "mkdir build && cd build && cmake -DOGS_BUILD_GUI=ON -DOGS_DONT_USE_OPTIONAL_SUBMODULES=ON .. && cmake .. && make && make test"
notifications: notifications:
email: email:
......
...@@ -35,7 +35,7 @@ IF(NOT Boost_INCLUDE_DIRS) ...@@ -35,7 +35,7 @@ IF(NOT Boost_INCLUDE_DIRS)
IF(IS_DIRECTORY /opt/boxen) IF(IS_DIRECTORY /opt/boxen)
SET(BOOST_ROOT /opt/boxen/homebrew) SET(BOOST_ROOT /opt/boxen/homebrew)
ENDIF() ENDIF()
FIND_PACKAGE(Boost 1.48.0 COMPONENTS ${BOOST_LIBS_TO_BUILD}) FIND_PACKAGE(Boost 1.46.0 COMPONENTS ${BOOST_LIBS_TO_BUILD})
IF(Boost_FOUND) IF(Boost_FOUND)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
RETURN() RETURN()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment