提交 e0d80931 编写于 作者: N Niels

the cmake in apt is too old

上级 bfd66788
...@@ -187,10 +187,6 @@ matrix: ...@@ -187,10 +187,6 @@ matrix:
- os: linux - os: linux
env: LLVM_VERSION=3.9.0 env: LLVM_VERSION=3.9.0
compiler: clang compiler: clang
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
packages: cmake
##################### #####################
# installation step # # installation step #
...@@ -217,6 +213,15 @@ install: ...@@ -217,6 +213,15 @@ install:
# make sure CXX is correctly set # make sure CXX is correctly set
- if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi - if [[ "${COMPILER}" != "" ]]; then export CXX=${COMPILER}; fi
# install recent CMake
- |
if [[ "${LLVM_VERSION}" != "" ]]; then
LLVM_DIR=${DEPS_DIR}/llvm-${LLVM_VERSION}
travis_retry wget --quiet https://cmake.org/files/v3.6/cmake-3.6.1-Linux-x86_64.sh
./cmake-3.6.1-Linux-x86_64.sh --prefix=${LLVM_DIR}/cmake
export PATH="${LLVM_DIR}/cmake/bin:${PATH}"
fi
# install LLVM/clang when LLVM_VERSION is set # install LLVM/clang when LLVM_VERSION is set
- | - |
if [[ "${LLVM_VERSION}" != "" ]]; then if [[ "${LLVM_VERSION}" != "" ]]; then
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册