Commit e642d65cebd7640d4f5f7dd72a7e2a4cdb43cca1
Committed by
Moritz Wirger
1 parent
ee4b130b
Bump Cmake Version to 3.7
Google Test fails as their community CMake File relies on VERSION_GREATER_EQUAL which is only available in CMake 3.7 and higher.
Showing
1 changed file
with
3 additions
and
1 deletions
.travis.yml
| @@ -12,6 +12,7 @@ env: | @@ -12,6 +12,7 @@ env: | ||
| 12 | # Misc | 12 | # Misc |
| 13 | - RUN_TESTS=true | 13 | - RUN_TESTS=true |
| 14 | - COVERAGE=false | 14 | - COVERAGE=false |
| 15 | + - PATH=${DEPS_DIR}/cmake/bin:${PATH} | ||
| 15 | 16 | ||
| 16 | matrix: | 17 | matrix: |
| 17 | include: | 18 | include: |
| @@ -42,7 +43,7 @@ install: | @@ -42,7 +43,7 @@ install: | ||
| 42 | - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-5 90 | 43 | - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-5 90 |
| 43 | # Download and install recent cmake | 44 | # Download and install recent cmake |
| 44 | - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then | 45 | - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then |
| 45 | - CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.1-Linux-x86_64.tar.gz"; | 46 | + CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.0-Linux-x86_64.tar.gz"; |
| 46 | mkdir -p ${DEPS_DIR}/cmake; | 47 | mkdir -p ${DEPS_DIR}/cmake; |
| 47 | travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR}/cmake; | 48 | travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR}/cmake; |
| 48 | export PATH=${DEPS_DIR}/cmake/bin:${PATH}; | 49 | export PATH=${DEPS_DIR}/cmake/bin:${PATH}; |
| @@ -54,6 +55,7 @@ install: | @@ -54,6 +55,7 @@ install: | ||
| 54 | - echo ${CXX} | 55 | - echo ${CXX} |
| 55 | - ${CXX} --version | 56 | - ${CXX} --version |
| 56 | - ${CXX} -v | 57 | - ${CXX} -v |
| 58 | + - cmake --version | ||
| 57 | - lcov --version | 59 | - lcov --version |
| 58 | 60 | ||
| 59 | script: | 61 | script: |