1
0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-05-01 21:23:52 +00:00

Moving to newer CMake (3.9) on Travis

This commit is contained in:
Henry Fredrick Schreiner 2017-11-21 15:48:56 -05:00 committed by Henry Schreiner
parent 6feb10fbc2
commit 9359f642cb
3 changed files with 11 additions and 5 deletions

View File

@ -9,11 +9,11 @@ install:
build_script: build_script:
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -DCLI_SINGLE_FILE_TESTS=ON -DCMAKE_GENERATOR="Visual Studio 14 2015" - cmake .. -DCLI_SINGLE_FILE_TESTS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_GENERATOR="Visual Studio 14 2015"
- cmake --build . - cmake --build .
test_script: test_script:
- ctest --output-on-failure - ctest --output-on-failure -C RelWithDebInfo
notifications: notifications:
- provider: Webhook - provider: Webhook

View File

@ -1,9 +1,14 @@
if [ "$TRAVIS_OS_NAME" = "linux" ] ; then CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" ; fi CMAKE_VERSION=3.9.6
if [ "$TRAVIS_OS_NAME" = "osx" ] ; then CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Darwin-x86_64.tar.gz" ; fi CMAKE_MVERSION=${CMAKE_VERSION%.*}
# Non Bash version:
# echo CMAKE_MVERSION=`$var | awk -F"." '{ print $1"."$2 }'`
if [ "$TRAVIS_OS_NAME" = "linux" ] ; then CMAKE_URL="https://cmake.org/files/v${CMAKE_MVERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" ; fi
if [ "$TRAVIS_OS_NAME" = "osx" ] ; then CMAKE_URL="https://cmake.org/files/v$CMAKE_MVERSION/cmake-$CMAKE_VERSION-Darwin-x86_64.tar.gz" ; fi
cd "${DEPS_DIR}" cd "${DEPS_DIR}"
if [[ ! -f "${DEPS_DIR}/cmake/bin/cmake" ]] ; then if [[ ! -f "${DEPS_DIR}/cmake/bin/cmake" ]] ; then
echo "Downloading CMake" echo "Downloading CMake $CMAKE_VERSION"
mkdir -p cmake mkdir -p cmake
travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake
fi fi

View File

@ -60,6 +60,7 @@ install:
- if [ -n "$COVERALLS" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_lcov.sh ; fi - if [ -n "$COVERALLS" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_lcov.sh ; fi
- cd "${DEPS_DIR}" - cd "${DEPS_DIR}"
- if [ "$(python -c 'import sys; print(sys.version_info[0])')" = "2" ] ; then pip install --user pathlib ; fi - if [ "$(python -c 'import sys; print(sys.version_info[0])')" = "2" ] ; then pip install --user pathlib ; fi
- cmake --version
script: script:
- cd "${TRAVIS_BUILD_DIR}" - cd "${TRAVIS_BUILD_DIR}"
- | - |