From f69134782270339b0365a18d5235a53f1428a11b Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 15:41:01 +0100 Subject: [PATCH] adding linux to travis --- .travis.yml | 1 + CMakeLists.txt | 12 +++++------- appveyor.yml | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 19a6203..78636af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ addons: language: cpp os: + - linux - osx compiler: diff --git a/CMakeLists.txt b/CMakeLists.txt index a5c7a16..73154f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,17 +35,15 @@ include_directories(${PROJECT_WIDE_INCLUDE}) # TODO: need to handle this with option set(Boost_USE_MULTITHREADED ON) -#set(Boost_USE_STATIC_LIBS ON) +set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME OFF) find_package(Boost COMPONENTS unit_test_framework REQUIRED) -if (Boost_FOUND) + # disable autolinking feature - add_definitions(-DBOOST_ALL_NO_LIB) - include_directories(${Boost_INCLUDE_DIRS}) -else() - message(FATAL_ERROR "Boost >= 1.35 required for testing wavelib") -endif() +add_definitions(-DBOOST_ALL_NO_LIB) +include_directories(${Boost_INCLUDE_DIRS}) + include_directories(${COMMON_BIN_PATH}) diff --git a/appveyor.yml b/appveyor.yml index 44f319b..9d5d87c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: build_script: - mkdir build - cd build - - cmake .. -G"Visual Studio 14 2015 Win64" + - cmake -G "Visual Studio 14 2015 Win64" .. - cmake --build . --config Debug test_script: