Skip to content

Commit

Permalink
Install boost libs for use_boost tutorial, or skip it
Browse files Browse the repository at this point in the history
If testing with system-wide Boost, we can as well install some Boost
libraries to test-build `use_boost` tutorial. If we are downloading a
specific version of Boost, compiling binary libraries is too much
hassle, and that tutorial is skipped (FIXME: and is not tested!).
  • Loading branch information
galexv committed Aug 28, 2018
1 parent 66a2a1e commit 2ed2022
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ addons:
- sourceline: ppa:kzemek/boost
packages:
- libboost1.58-dev
- libboost-filesystem1.58-dev # for `use_boost` tutorial
- openmpi-bin
- openmpi-common
- openmpi-doc
Expand Down
4 changes: 3 additions & 1 deletion common/build/build.travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set -ev

# Explicitly download Boost, if a specific version is requested
boost_cmake_params=""
no_boost_libs=false
if [ -n "$ALPS_BOOST_VERSION" ]; then
download_dir=$HOME/boost
mkdir -pv $download_dir
Expand All @@ -14,6 +15,7 @@ if [ -n "$ALPS_BOOST_VERSION" ]; then
wget -S -O $boost_tgz $boost_url
tar -C $download_dir -xzf $boost_tgz
boost_cmake_params="-DBoost_NO_SYSTEM_PATHS=true -DBoost_NO_BOOST_CMAKE=true -DBOOST_ROOT=$download_dir/boost_${ALPS_BOOST_VERSION}"
no_boost_libs=true
fi

# Build ALPSCore
Expand Down Expand Up @@ -51,4 +53,4 @@ make install
# Test tutorials build
mkdir -pv tutorials
cd tutorials
ALPSCore_DIR=$TRAVIS_BUILD_DIR/installed cmake $alpscore_src/tutorials
ALPSCore_DIR=$TRAVIS_BUILD_DIR/installed cmake $alpscore_src/tutorials -DALPS_TUTORIALS_NO_BOOST_LIBS=${no_boost_libs}

0 comments on commit 2ed2022

Please sign in to comment.