diff --git a/.travis.yml b/.travis.yml index 7bf2c285e3f70cbe9fbde443830a9cbf47a6dfa0..d14dfb79108485b5d082f4ee0c2156868d87b239 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,85 +128,85 @@ matrix: - OPENCL_VERSION="11" - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/pocl/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - ############################################################################ - # Khronos ICD builds (without running tests) (OpenCL 1.2, 2.0) - ############################################################################ + ############################################################################ + # Khronos ICD builds (without running tests) (OpenCL 1.2, 2.0) + ############################################################################ - # Precise, OpenCL 1.2, Travis CI container-based infrastructure - - os: linux - sudo: false - compiler: clang - addons: - apt: - packages: &precise_icd_packages - - g++ - # Boost - - libboost-chrono1.55-dev - - libboost-date-time1.55-dev - - libboost-test1.55-dev - - libboost-system1.55-dev - - libboost-filesystem1.55-dev - - libboost-timer1.55-dev - - libboost-program-options1.55-dev - - libboost-thread1.55-dev - # Misc - - python-yaml - - lcov - - libopencv-dev - sources: &precise_icd_sources - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 - - boost-latest - env: - - RUN_TEST=false - - OPENCL_LIB=khronos-icd - - OPENCL_VERSION="12" - - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - - os: linux - sudo: false - compiler: gcc - addons: - apt: - packages: *precise_icd_packages - sources: *precise_icd_sources - env: - - RUN_TEST=false - - OPENCL_LIB=khronos-icd - - OPENCL_VERSION="12" - - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + # Precise, OpenCL 1.2, Travis CI container-based infrastructure + - os: linux + sudo: false + compiler: clang + addons: + apt: + packages: &precise_icd_packages + - g++ + # Boost + - libboost-chrono1.55-dev + - libboost-date-time1.55-dev + - libboost-test1.55-dev + - libboost-system1.55-dev + - libboost-filesystem1.55-dev + - libboost-timer1.55-dev + - libboost-program-options1.55-dev + - libboost-thread1.55-dev + # Misc + - python-yaml + - lcov + - libopencv-dev + sources: &precise_icd_sources + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + - boost-latest + env: + - RUN_TEST=false + - OPENCL_LIB=khronos-icd + - OPENCL_VERSION="12" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + - os: linux + sudo: false + compiler: gcc + addons: + apt: + packages: *precise_icd_packages + sources: *precise_icd_sources + env: + - RUN_TEST=false + - OPENCL_LIB=khronos-icd + - OPENCL_VERSION="12" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" # Precise, OpenCL 2.0, Travis CI container-based infrastructure - - os: linux - sudo: false - compiler: clang - addons: - apt: + - os: linux + sudo: false + compiler: clang + addons: + apt: packages: *precise_icd_packages sources: *precise_icd_sources - env: - - RUN_TEST=false - - OPENCL_LIB=khronos-icd - - OPENCL_VERSION="20" - - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - - OPENCL_FILE="${OPENCL_ROOT}/lib/libOpenCL.so" - - os: linux - sudo: false - compiler: gcc - addons: - apt: - packages: *precise_icd_packages - sources: *precise_icd_sources - env: - - RUN_TEST=false - - OPENCL_LIB=khronos-icd - - OPENCL_VERSION="20" - - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + env: + - RUN_TEST=false + - OPENCL_LIB=khronos-icd + - OPENCL_VERSION="20" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" + - OPENCL_FILE="${OPENCL_ROOT}/lib/libOpenCL.so" + - os: linux + sudo: false + compiler: gcc + addons: + apt: + packages: *precise_icd_packages + sources: *precise_icd_sources + env: + - RUN_TEST=false + - OPENCL_LIB=khronos-icd + - OPENCL_VERSION="20" + - ENV_CMAKE_OPTIONS="-DOpenCL_LIBRARY=${OPENCL_ROOT}/lib/libOpenCL.so -DOpenCL_INCLUDE_DIR=${OPENCL_ROOT}/include" - ############################################################################ - # OSX - ############################################################################ -# - # OSX build - - os: osx + ############################################################################ + # OSX + ############################################################################ + + # OSX build + - os: osx compiler: clang env: - ENV_CXX_FLAGS="-Wno-c99-extensions"