Merge branch 'master' into dev
This commit is contained in:
10
.travis.yml
10
.travis.yml
@@ -45,13 +45,10 @@ matrix:
|
|||||||
- nasm
|
- nasm
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
|
arch: ppc64le
|
||||||
env:
|
env:
|
||||||
CMAKE_FLAGS="-DWITH_JPEG8=1"
|
CMAKE_FLAGS="-DWITH_JPEG8=1"
|
||||||
CTEST_OUTPUT_ON_FAILURE=1
|
CTEST_OUTPUT_ON_FAILURE=1
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
packages:
|
|
||||||
- nasm
|
|
||||||
- os: linux
|
- os: linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env:
|
env:
|
||||||
@@ -64,11 +61,6 @@ matrix:
|
|||||||
arch: arm64
|
arch: arm64
|
||||||
env:
|
env:
|
||||||
CTEST_OUTPUT_ON_FAILURE=1
|
CTEST_OUTPUT_ON_FAILURE=1
|
||||||
- os: linux
|
|
||||||
compiler: gcc
|
|
||||||
arch: ppc64le
|
|
||||||
env:
|
|
||||||
CTEST_OUTPUT_ON_FAILURE=1
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- if [ "$BUILD_X32" = "1" ]; then
|
- if [ "$BUILD_X32" = "1" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user