mirror of
https://github.com/simon987/wavelib.git
synced 2025-04-20 02:26:45 +00:00
adding linux to travis
This commit is contained in:
parent
77982d9ee5
commit
f691347822
@ -13,6 +13,7 @@ addons:
|
|||||||
language: cpp
|
language: cpp
|
||||||
|
|
||||||
os:
|
os:
|
||||||
|
- linux
|
||||||
- osx
|
- osx
|
||||||
|
|
||||||
compiler:
|
compiler:
|
||||||
|
@ -35,17 +35,15 @@ include_directories(${PROJECT_WIDE_INCLUDE})
|
|||||||
|
|
||||||
# TODO: need to handle this with option
|
# TODO: need to handle this with option
|
||||||
set(Boost_USE_MULTITHREADED ON)
|
set(Boost_USE_MULTITHREADED ON)
|
||||||
#set(Boost_USE_STATIC_LIBS ON)
|
set(Boost_USE_STATIC_LIBS ON)
|
||||||
set(Boost_USE_STATIC_RUNTIME OFF)
|
set(Boost_USE_STATIC_RUNTIME OFF)
|
||||||
|
|
||||||
find_package(Boost COMPONENTS unit_test_framework REQUIRED)
|
find_package(Boost COMPONENTS unit_test_framework REQUIRED)
|
||||||
if (Boost_FOUND)
|
|
||||||
# disable autolinking feature
|
# disable autolinking feature
|
||||||
add_definitions(-DBOOST_ALL_NO_LIB)
|
add_definitions(-DBOOST_ALL_NO_LIB)
|
||||||
include_directories(${Boost_INCLUDE_DIRS})
|
include_directories(${Boost_INCLUDE_DIRS})
|
||||||
else()
|
|
||||||
message(FATAL_ERROR "Boost >= 1.35 required for testing wavelib")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include_directories(${COMMON_BIN_PATH})
|
include_directories(${COMMON_BIN_PATH})
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ environment:
|
|||||||
build_script:
|
build_script:
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- cmake .. -G"Visual Studio 14 2015 Win64"
|
- cmake -G "Visual Studio 14 2015 Win64" ..
|
||||||
- cmake --build . --config Debug
|
- cmake --build . --config Debug
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user