Add a Travis test for CONFIG COMPONENTS ALL

This commit is contained in:
Peter Dimov
2020-04-23 17:12:44 +03:00
parent 25b8cae4f4
commit dc769f59a2
2 changed files with 34 additions and 1 deletions
+29
View File
@@ -168,6 +168,7 @@ matrix:
- env: LIB=thread UBP=1
- env: LIB=wave
- env: LIB=wave UBP=1
- env: ALL=1
install:
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
@@ -196,6 +197,34 @@ matrix:
- export DYLD_LIBRARY_PATH=$HOME/.local/lib:$DYLD_LIBRARY_PATH
- cmake --build . --target check
- env: ALL_CONFIG=1
install:
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
- cd ..
- git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root
- git submodule update --init --jobs 3
- rm -rf tools/boost_install/*
- cp -r $TRAVIS_BUILD_DIR/* tools/boost_install
- ./bootstrap.sh
- ./b2 headers
- |-
echo "using python : 2.7 ;" >> ~/user-config.jam
- |-
echo "using python : 3.5 ;" >> ~/user-config.jam
- |-
echo "using mpi ;" >> ~/user-config.jam
- ./b2 -j3 --prefix=$HOME/.local python=2.7,3.5 install
script:
- cd tools/boost_install/test/filesystem
- mkdir __build__ && cd __build__
- if [ -z "$STAGE" ]; then export CMAKE_INSTALL="-DCMAKE_INSTALL_PREFIX=~/.local"; fi
- cmake -DCMAKE_INSTALL_PREFIX=~/.local -DUSE_ALL_COMPONENTS_CONFIG=1 -DBoost_DEBUG=ON ..
- cmake --build .
- export LD_LIBRARY_PATH=$HOME/.local/lib:$LD_LIBRARY_PATH
- export DYLD_LIBRARY_PATH=$HOME/.local/lib:$DYLD_LIBRARY_PATH
- cmake --build . --target check
install:
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
- cd ..
+5 -1
View File
@@ -1,4 +1,4 @@
# Copyright 2018, 2019 Peter Dimov
# Copyright 2018-2020 Peter Dimov
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
@@ -22,6 +22,10 @@ if(USE_ALL_COMPONENTS)
find_package(Boost ${BOOST_VERSION} EXACT REQUIRED ALL ${BOOST_HINTS})
elseif(USE_ALL_COMPONENTS_CONFIG)
find_package(Boost ${BOOST_VERSION} EXACT CONFIG REQUIRED ALL ${BOOST_HINTS})
elseif(USE_BOOST_PACKAGE)
find_package(Boost ${BOOST_VERSION} EXACT REQUIRED COMPONENTS filesystem ${BOOST_HINTS})