Update travis to use clang and g++7
This commit is contained in:
+20
-5
@@ -1,8 +1,24 @@
|
|||||||
language: cpp
|
language: cpp
|
||||||
dist: xenial
|
dist: xenial
|
||||||
compiler:
|
|
||||||
- clang
|
matrix:
|
||||||
- gcc
|
include:
|
||||||
|
- os: linux
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
sources:
|
||||||
|
- ubuntu-toolchain-r-test
|
||||||
|
packages:
|
||||||
|
- g++-7
|
||||||
|
env:
|
||||||
|
- QMAKE_SPEC=linux-g++
|
||||||
|
|
||||||
|
- os: linux
|
||||||
|
env:
|
||||||
|
- QMAKE_SPEC=linux-clang
|
||||||
|
|
||||||
|
before_install:
|
||||||
|
- python ./build_scripts/run-clang-format.py ./src -r --color always
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- sudo add-apt-repository ppa:kubuntu-ppa/backports -y
|
- sudo add-apt-repository ppa:kubuntu-ppa/backports -y
|
||||||
@@ -10,7 +26,6 @@ install:
|
|||||||
- sudo apt-get install build-essential qtbase5-dev qttools5-dev qtdeclarative5-dev qtmultimedia5-dev qt5-default qttools5-dev-tools
|
- sudo apt-get install build-essential qtbase5-dev qttools5-dev qtdeclarative5-dev qtmultimedia5-dev qt5-default qttools5-dev-tools
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- python ./build_scripts/run-clang-format.py ./src -r --color always
|
|
||||||
- mkdir build && cd build
|
- mkdir build && cd build
|
||||||
- qmake ..
|
- qmake .. -spec $QMAKE_SPEC
|
||||||
- make
|
- make
|
||||||
|
|||||||
@@ -40,7 +40,10 @@ win32-clang-msvc{
|
|||||||
}
|
}
|
||||||
|
|
||||||
*g++* {
|
*g++* {
|
||||||
|
#g++-7 is needed for C++17 features. travis does not supply this by default.
|
||||||
|
QMAKE_CXX = g++-7
|
||||||
QMAKE_CXXFLAGS += -Werror
|
QMAKE_CXXFLAGS += -Werror
|
||||||
|
QMAKE_CXXFLAGS += -std=c++17
|
||||||
}
|
}
|
||||||
|
|
||||||
#Look for anything clang that is not clang-msvc, since it does not
|
#Look for anything clang that is not clang-msvc, since it does not
|
||||||
@@ -49,6 +52,7 @@ win32-clang-msvc{
|
|||||||
QMAKE_CXXFLAGS += -Werror
|
QMAKE_CXXFLAGS += -Werror
|
||||||
#All includes from the third-party directory will not warn.
|
#All includes from the third-party directory will not warn.
|
||||||
QMAKE_CXXFLAGS += --system-header-prefix=third-party
|
QMAKE_CXXFLAGS += --system-header-prefix=third-party
|
||||||
|
QMAKE_CXXFLAGS += -std=c++17
|
||||||
}
|
}
|
||||||
SOURCES += src/main.cpp\
|
SOURCES += src/main.cpp\
|
||||||
src/overlaycontroller.cpp \
|
src/overlaycontroller.cpp \
|
||||||
|
|||||||
Reference in New Issue
Block a user