Skip to content

adding Boost to CMake and fixing up Travis #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 11, 2014
Merged

adding Boost to CMake and fixing up Travis #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3019ea7
enabling Boost in CMake and include it for example
torbjoernk Jun 11, 2014
e04f448
travis: adding Boost as prerequirements
torbjoernk Jun 11, 2014
55425e2
I should not only add the PPA but also install the Boost(er)
torbjoernk Jun 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ env:
- CMAKE_BUILD_TYPE="Debug"

before_install:
- sudo add-apt-repository ppa:apokluda/boost1.53 --yes
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test --yes # libstdc++-4.8
- if [ "${CXX}" == "clang++" ]; then sudo add-apt-repository --yes ppa:h-rayflood/llvm; fi # clang++-3.2
- sudo apt-get update

install:
- if [ "${CXX}" == "clang++" ]; then sudo apt-get -qq install clang-3.2; fi
- sudo apt-get install g++-4.8; # clang need it for libstdc++ update
- sudo apt-get install g++-4.8 # clang need it for libstdc++ update
- sudo apt-get install libboost1.53-all-dev

before_script:
# update compilers
Expand Down
17 changes: 17 additions & 0 deletions 3rdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@ set(3rdparty_INCLUDES ${3rdparty_INCLUDES})
set(3rdparty_DEPENDEND_LIBS ${3rdparty_DEPENDEND_LIBS})
message(STATUS "--------------------------------------------------------------------------------")

message(STATUS "Boost")

if(pfasst_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
set(Boost_USE_STATIC_LIBS OFF)
set(pfasst_BUILD_SHARED_LIBS ON)
set(BUILD_SHARED_LIBS ON)
else()
set(Boost_USE_STATIC_LIBS ON)
set(pfasst_BUILD_SHARED_LIBS OFF)
set(BUILD_SHARED_LIBS OFF)
endif()
set(Boost_USE_MULTITHREADED ON)

find_package(Boost REQUIRED)
list(APPEND 3rdparty_INCLUDES ${Boost_INCLUDE_DIRS})


if(pfasst_BUILD_EXAMPLES)
message(STATUS "FFTW3")
set(fftw3_SOURCE_DIR "${pfasst_BINARY_DIR}/3rdparty/src/fftw3")
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ message(STATUS "Configuring 3rd party libraries")
# makes available:
# - fftw3_INCLUDES (if pfasst_BUILD_EXAMPLES)
# - fftw3_LIBS (if pfasst_BUILD_EXAMPLES)
# and Boost headers in 3rdparty_INCLUDES
add_subdirectory(3rdparty)

message(STATUS "********************************************************************************")
Expand Down
1 change: 1 addition & 0 deletions examples/advection_diffusion/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
message(STATUS " advection_diffusion")
include_directories(
${3rdparty_INCLUDES}
${fftw3_INCLUDES}
${pfasst_INCLUDES}
)
Expand Down