diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-01-07 17:23:53 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-01-07 18:00:16 +0300 |
| commit | 2932ded479351d6161d38d9e2b308bcaf17947f7 (patch) | |
| tree | 11a42c5ab5639fd84b2366abe2366351f0a985b4 | |
| parent | cmake/examples: fix boost/ (diff) | |
| download | cmake-common-2932ded479351d6161d38d9e2b308bcaf17947f7.tar.gz cmake-common-2932ded479351d6161d38d9e2b308bcaf17947f7.zip | |
Travis: fix examples/boost builds
Diffstat (limited to '')
| -rw-r--r-- | .travis.yml | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index b3006f5..107beb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,11 +12,23 @@ jobs: include: - name: Simple CMake projects script: - - ./cmake/build/build.py --install "$HOME/install/simple" --configuration Release -- cmake/examples/simple + - |- + ./cmake/build/build.py \ + --install "$HOME/install/simple" --configuration Release \ + -- cmake/examples/simple - "$HOME/install/simple/bin/foo" - - ./cmake/build/build.py --install "$HOME/install/static" --configuration Debug -- cmake/examples/static + + - |- + ./cmake/build/build.py \ + --install "$HOME/install/static" --configuration Debug \ + -- cmake/examples/static \ + -D "CMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/toolchains/gcc-x86.cmake" - "$HOME/install/static/bin/foo" - - ./cmake/build/build.py --install "$HOME/install/dynamic" --configuration Release -- cmake/examples/dynamic + + - |- + ./cmake/build/build.py \ + --install "$HOME/install/dynamic" --configuration Release \ + -- cmake/examples/dynamic - LD_LIBRARY_PATH="$HOME/install/dynamic/lib" "$HOME/install/dynamic/bin/foo" - name: Boost 1.58 @@ -29,10 +41,12 @@ jobs: --with-filesystem --with-program_options - bash -o pipefail -c 'find boost_1_58_0/stage -type f | sort' - |- - ./cmake/build/build.py --install "$HOME/install/boost" \ + ./cmake/build/build.py \ + --configuration Debug --install "$HOME/install/boost" \ -- cmake/examples/boost \ - -D BOOST_ROOT="$TRAVIS_BUILD_DIR/boost_1_58_0" \ - -D BOOST_LIBRARYDIR="$TRAVIS_BUILD_DIR/boost_1_58_0/stage/x86/Debug/lib" + -D "BOOST_ROOT=$TRAVIS_BUILD_DIR/boost_1_58_0" \ + -D "BOOST_LIBRARYDIR=$TRAVIS_BUILD_DIR/boost_1_58_0/stage/x86/Debug/lib" \ + -D "CMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/toolchains/gcc-x86.cmake" - "$HOME/install/boost/bin/foo" - name: Boost 1.72 @@ -44,6 +58,14 @@ jobs: -- ./boost_1_72_0 \ --with-filesystem --with-program_options - bash -o pipefail -c 'find boost_1_72_0/stage -type f | sort' + - |- + ./cmake/build/build.py \ + --configuration Release --install "$HOME/install/boost" \ + -- cmake/examples/boost \ + -D "BOOST_ROOT=$TRAVIS_BUILD_DIR/boost_1_72_0" \ + -D "BOOST_LIBRARYDIR=$TRAVIS_BUILD_DIR/boost_1_72_0/stage/x64/Release/lib" \ + -D Boost_USE_STATIC_LIBS=OFF + - LD_LIBRARY_PATH="$TRAVIS_BUILD_DIR/boost_1_72_0/stage/x64/Release/lib" "$HOME/install/boost/bin/foo" - name: Boost 1.65 script: |