Travis full matrix

This commit is contained in:
mayeut 2015-09-12 18:21:25 +02:00
parent b8ba5a8357
commit 0b611c5250
3 changed files with 38 additions and 5 deletions

View File

@ -1,10 +1,10 @@
language: c language: c
os: os:
- linux - linux
# - osx - osx
compiler: compiler:
# - gcc - gcc
# - clang - clang
- x86_64-w64-mingw32-gcc - x86_64-w64-mingw32-gcc
env: env:
- OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
@ -19,6 +19,9 @@ matrix:
compiler: x86_64-w64-mingw32-gcc compiler: x86_64-w64-mingw32-gcc
- compiler: clang - compiler: clang
env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
- os: linux
compiler: clang
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
- compiler: gcc - compiler: gcc
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1 env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
- compiler: x86_64-w64-mingw32-gcc - compiler: x86_64-w64-mingw32-gcc

View File

@ -0,0 +1,26 @@
# http://www.cmake.org/Wiki/CmakeMingw
#
# Copyright (c) 2006-2014 Mathieu Malaterre <mathieu.malaterre@voxxl.com>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
# the name of the target operating system
set(CMAKE_SYSTEM_NAME Windows)
# which compilers to use for C and C++
set(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
set(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
# here is the target environment located
set(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)
# adjust the default behaviour of the FIND_XXX() commands:
# search headers and libraries in the target environment, search
# programs in the host environment
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

View File

@ -48,8 +48,12 @@ endif()
if("$ENV{CC}" MATCHES ".*mingw.*") if("$ENV{CC}" MATCHES ".*mingw.*")
# We are trying to use mingw # We are trying to use mingw
if ("$ENV{OPJ_CI_ARCH}" MATCHES "^i[3-6]86$")
set(CTEST_CONFIGURE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CTEST_SCRIPT_DIRECTORY}/toolchain-mingw32.cmake")
else()
set(CTEST_CONFIGURE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CTEST_SCRIPT_DIRECTORY}/toolchain-mingw64.cmake") set(CTEST_CONFIGURE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CTEST_SCRIPT_DIRECTORY}/toolchain-mingw64.cmake")
endif() endif()
endif()
if(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1") if(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1")
# To execute part of the encoding test suite, kakadu binaries are needed to decode encoded image and compare # To execute part of the encoding test suite, kakadu binaries are needed to decode encoded image and compare
@ -126,4 +130,4 @@ endif()
if ("$ENV{OPJ_DO_SUBMIT}" STREQUAL "1") if ("$ENV{OPJ_DO_SUBMIT}" STREQUAL "1")
ctest_submit() ctest_submit()
endif() endif()
#ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" ) ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" )