From 54f6d08b33989b4e5d4ae9634864352b55acbb94 Mon Sep 17 00:00:00 2001
From: Matthew Hausknecht <matthew.hausknecht@gmail.com>
Date: Mon, 4 Jul 2016 19:06:01 -0500
Subject: [PATCH] Updated travis.
---
.travis.yml | 5 ++++-
CMakeLists.txt | 9 ++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f741539..8f445b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ addons:
- boost-latest
packages:
- libboost-dev
+ - libboost-system-dev
+ - libboost-filesystem-dev
os:
- linux
- osx
@@ -14,4 +16,5 @@ compiler:
- clang
- gcc
script:
- - cmake -DCMAKE_BUILD_TYPE=Release && make -j4
+ - mkdir build && cd build
+ - cmake -DCMAKE_BUILD_TYPE=Release && make -j4 && make install
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc6a15e..1520c08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,16 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
project(hfo)
include(ExternalProject)
option(BUILD_SOCCERWINDOW "Build Soccerwindow Visualizer" ON)
option(INSTALL_ADDITIONAL_TEAMS "Install additional team binaries" ON)
-add_definitions(-DELOG -std=c++11)
+add_definitions(-DELOG)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-find_package(Boost REQUIRED)
+find_package(Boost COMPONENTS system filesystem REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(FLEX REQUIRED)
include_directories(${Boost_INCLUDE_DIRS})
ExternalProject_Add(rcssserver
--
2.24.1