Skip to content

Commit

Permalink
removed boost dependencies (#4)
Browse files Browse the repository at this point in the history
* removed boost dependencies

* backport cmake 3 to travis ubuntu 14.04 image

* require C11 standard for all targets

* try build on trusty images

* fix submodule building in appveyor

* fix fix

* fix fix fix
  • Loading branch information
Garandor authored May 27, 2017
1 parent a076052 commit 72c5fb3
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 26 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
# https://gist.github.com/vidavidorra/548ffbcdae99d752da02
# http://www.steveklabnik.com/automatically_update_github_pages_with_travis_example/

#use trusty distro for C++11 and cmake 3+
dist: trusty
sudo: false

#blacklist
branches:
except:
Expand All @@ -14,17 +18,13 @@ env:
#additional deps
addons:
apt:
sources:
- boost-latest
packages:
#docs
- doxygen
- doxygen-doc
- doxygen-latex
- doxygen
- graphviz
#unit testing w CUTE
- libboost1.55-all-dev
#build
- cmake

Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.4)
cmake_minimum_required(VERSION 3.1)

project(pfcrender)

Expand All @@ -8,6 +8,9 @@ set(VERSION_MINOR 1 CACHE STRING "Minor version number.")
set(VERSION_PATCH 0 CACHE STRING "Patch version number.")
mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH)

set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 11)

add_subdirectory(doc)
add_subdirectory(lib)
add_subdirectory(src)
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ environment:
- GENERATOR: "Visual Studio 14 2015"
os: Visual Studio 2015

#install:
# - cmd: git submodule update --init --recursive
install:
- git submodule update --init --recursive

before_build:
- cd bin
Expand Down
28 changes: 9 additions & 19 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,11 @@
set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_STATIC_RUNTIME OFF)
find_package(Boost 1.45.0)
enable_testing()

if(Boost_FOUND)
enable_testing()
include_directories(
${CMAKE_SOURCE_DIR}/lib/CUTE/cute
${CMAKE_SOURCE_DIR}/src
)

include_directories(
${Boost_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/lib/CUTE/cute
${CMAKE_SOURCE_DIR}/src
)

#file(GLOB_RECURSE SRC *.cpp)
#add_executable(cute ${SRC})
add_executable(cute Test.cpp)
add_test(NAME UnitTests COMMAND cute)
target_link_libraries(cute ${Boost_LIBRARIES})
else()
message(STATUS "Boost not found, no unit testing possible")
endif()
#file(GLOB_RECURSE SRC *.cpp)
#add_executable(cute ${SRC})
add_executable(cute Test.cpp)
add_test(NAME UnitTests COMMAND cute)

0 comments on commit 72c5fb3

Please sign in to comment.