Skip to content

Commit

Permalink
Fix CI build
Browse files Browse the repository at this point in the history
  • Loading branch information
akermu committed Jul 19, 2019
1 parent 044bb90 commit 120618b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ before_install:
- export PATH="$HOME/bin:$PATH"
- wget 'https://raw.githubusercontent.com/flycheck/emacs-travis/master/emacs-travis.mk'
- make -f emacs-travis.mk EMACSCONFFLAGS="--with-x-toolkit=no --without-x --without-all --with-xml2 --with-modules CFLAGS='-O2 -march=native' CXXFLAGS='-O2 -march=native'" install_emacs
# libvterm
- bzr branch lp:libvterm $HOME/libvterm
- make -C "$HOME/libvterm" CFLAGS='-O2' PREFIX='/usr'
- sudo make -C "$HOME/libvterm" install
# cmake
- wget 'https://github.com/Kitware/CMake/releases/download/v3.15.0/cmake-3.15.0-Linux-x86_64.tar.gz'
- tar -xf cmake-3.15.0-Linux-x86_64.tar.gz
- export CMAKE="$(pwd)/cmake-3.15.0-Linux-x86_64/bin/cmake"

script:
- mkdir build
- cd build
- cmake ..
- ${CMAKE} ..
- make

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.11)

This comment has been minimized.

Copy link
@TheBB

TheBB Nov 27, 2019

Contributor

Was this really necessary? The latest Ubuntu LTS ships with 3.10.

include(ExternalProject)

project(emacs-libvterm C)
Expand Down

0 comments on commit 120618b

Please sign in to comment.