Merge pull request #6 from torbjoernk/feature/cmake-boost-travis

adding Boost to CMake and fixing up Travis

Author: memmett

.travis.yml

@@ -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

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")

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 "********************************************************************************")

examples/advection_diffusion/CMakeLists.txt

@@ -1,5 +1,6 @@
 message(STATUS "  advection_diffusion")
 include_directories(
+    ${3rdparty_INCLUDES}
     ${fftw3_INCLUDES}
     ${pfasst_INCLUDES}
 )