Build with Qt 5.4.1 and cmake 3.3.0

plfiorini · plfiorini · commit 8612a2b26ab6 · 2015-08-17T18:16:14.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,22 +6,24 @@ compiler:
 before_install:
   - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
   - if [ "$CXX" == "clang++" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi
-
   - sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
   - sudo add-apt-repository ppa:czchen/travis-ci -y
+  - sudo add-apt-repository -y ppa:beineri/opt-qt541
   - sudo apt-get update -y
+
 install:
   # gcc
   - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
   - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
   # clang
   - if [ "$CXX" == "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi
   - if [ "$CXX" == "clang++" ]; then export CXX="clang++-3.4"; fi
-
-  - sudo apt-get install qtdeclarative5-dev qttools5-dev qttools5-dev-tools
+  # qt
+  - sudo apt-get update
+  - sudo apt-get -y install qt54declarative qt54tools
+  # pam and x11
   - sudo apt-get install -qq libpam0g-dev libX11-dev libx11-xcb-dev
-  - sudo apt-get install cmake -y
-
+  # xcb
   - sudo wget http://mirrors.kernel.org/ubuntu/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1_amd64.deb
   - sudo wget http://mirrors.kernel.org/ubuntu/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1_amd64.deb
   - sudo wget http://mirrors.kernel.org/ubuntu/pool/main/libx/libxcb/libxcb1-dev_1.10-2ubuntu1_amd64.deb
@@ -32,9 +34,15 @@ install:
   - sudo dpkg --force-depends -i libxcb-xkb-dev_1.10-2ubuntu1_amd64.deb
 
 before_script:
+  # cmake
+  - wget --no-check-certificate http://www.cmake.org/files/v3.3/cmake-3.3.0-Linux-x86_64.tar.gz -O cmake.tar.gz
+  - tar -xzf cmake.tar.gz -C $HOME
+  - export PATH=$HOME/cmake-3.3.0-Linux-x86_64/bin:$PATH
+  - cmake --version
+  # prepare
+  - source /opt/qt54/bin/qt54-env.sh
   - mkdir build
   - cd build
   - cmake ..
 
 script: make
-
