Skip to content

Commit

Permalink
Moving to newer CMake (3.9) on Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
henryiii committed Nov 21, 2017
1 parent 6e4a549 commit c1109e5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ install:
build_script:
- mkdir 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 .

test_script:
- ctest --output-on-failure
- ctest --output-on-failure -C RelWithDebInfo

notifications:
- provider: Webhook
Expand Down
11 changes: 8 additions & 3 deletions .ci/build_cmake.sh
Original file line number Diff line number Diff line change
@@ -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
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_VERSION=3.9.6
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}"

if [[ ! -f "${DEPS_DIR}/cmake/bin/cmake" ]] ; then
echo "Downloading CMake"
echo "Downloading CMake $CMAKE_VERSION"
mkdir -p cmake
travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake
fi
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ install:
- if [ -n "$COVERALLS" ] ; then cd $TRAVIS_BUILD_DIR && . .ci/build_lcov.sh ; fi
- cd "${DEPS_DIR}"
- if [ "$(python -c 'import sys; print(sys.version_info[0])')" = "2" ] ; then pip install --user pathlib ; fi
- cmake --version
script:
- cd "${TRAVIS_BUILD_DIR}"
- |
Expand Down

0 comments on commit c1109e5

Please sign in to comment.