From 4d0628ddcd1709cd0032c4b34b2865e6eab46923 Mon Sep 17 00:00:00 2001 From: sgroat Date: Sat, 11 Mar 2017 09:56:47 -0800 Subject: [PATCH 1/3] changes have to push to OpenCL --- .travis.yml | 4 ---- deps/OpenCL-Headers/CL | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb0ebad1b..30b8ab16c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,3 @@ -# this is a workaround because some OpenCL headers cause problems with older gcc compilers (undefined macro: _WIN32) -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sed -i "" 's/if _WIN32/if defined (_WIN32)/' deps/OpenCL-Headers/CL/cl_platform.h; fi - - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sed -i 's/if _WIN32/if defined (_WIN32)/' deps/OpenCL-Headers/CL/cl_platform.h; fi os: - linux - osx diff --git a/deps/OpenCL-Headers/CL b/deps/OpenCL-Headers/CL index 42e7afe06..bf0f43b76 160000 --- a/deps/OpenCL-Headers/CL +++ b/deps/OpenCL-Headers/CL @@ -1 +1 @@ -Subproject commit 42e7afe066a67107c2236b86c9864a472f8eead8 +Subproject commit bf0f43b76f4556c3d5717f8ba8a01216b27f4af7 From 7cecfb74f870d5bd3fd76c6b5cae912d4aa48000 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 11 Mar 2017 10:13:38 -0800 Subject: [PATCH 2/3] try to include trusty builds --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 30b8ab16c..4d1302120 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,9 @@ language: c compiler: - clang - gcc +matrix: + include: + - os: linux + dist: trusty script: - make From 1cee5b47ae83dd94c64d7e0dccb40e5f826c02a2 Mon Sep 17 00:00:00 2001 From: Stephen Date: Sat, 11 Mar 2017 10:35:50 -0800 Subject: [PATCH 3/3] matrix not expanding correctly --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4d1302120..38128d620 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,9 @@ matrix: include: - os: linux dist: trusty + compiler: gcc + - os: linux + dist: trusty + compiler: clang script: - make