From 3019ea74f7c9517b5075e0e5357f0ddef950db3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Klatt?= Date: Wed, 11 Jun 2014 09:39:12 +0200 Subject: [PATCH 1/3] enabling Boost in CMake and include it for example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to use Boost headers just include '3rdparty_INCLUDES' Signed-off-by: Torbjörn Klatt --- 3rdparty/CMakeLists.txt | 17 +++++++++++++++++ CMakeLists.txt | 1 + examples/advection_diffusion/CMakeLists.txt | 1 + 3 files changed, 19 insertions(+) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 77eeedb5..8eb59510 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -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") diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a61997b..26b5df2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 "********************************************************************************") diff --git a/examples/advection_diffusion/CMakeLists.txt b/examples/advection_diffusion/CMakeLists.txt index 85bab245..e97e8087 100644 --- a/examples/advection_diffusion/CMakeLists.txt +++ b/examples/advection_diffusion/CMakeLists.txt @@ -1,5 +1,6 @@ message(STATUS " advection_diffusion") include_directories( + ${3rdparty_INCLUDES} ${fftw3_INCLUDES} ${pfasst_INCLUDES} ) From e04f4484b2f8f8fda3fd3ca58a9b23f666f6954c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Klatt?= Date: Wed, 11 Jun 2014 09:42:41 +0200 Subject: [PATCH 2/3] travis: adding Boost as prerequirements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Torbjörn Klatt --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2f000624..71db64de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ 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 From 55425e2f14eb59511e9dd9b1211263c7eadc3b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Klatt?= Date: Wed, 11 Jun 2014 09:47:50 +0200 Subject: [PATCH 3/3] I should not only add the PPA but also install the Boost(er) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Torbjörn Klatt --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 71db64de..6cd61e9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,8 @@ before_install: 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