X-Git-Url: http://rtime.felk.cvut.cz/gitweb/hercules2020/kcf.git/blobdiff_plain/a48389efd064c2742b218dfcc25ef37c8398eb5b..f3e65d894fcc19609d0a841fa4919bb8a4c4605f:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 5a991b7..3f773e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ addons:
       - ninja-build
       - libopencv-dev
       - libfftw3-dev
-      - cuda-command-line-tools-8-0 cuda-cufft-dev-8-0 cuda-cublas-dev-8-0
 
 env:
   - CUDA_BIN_PATH=/usr/local/cuda-8.0 CXXFLAGS=-Werror CUDA_ARCH_LIST=6.2 NINJA_STATUS="[%f/%t] "
@@ -27,6 +26,7 @@ matrix:
           packages:
             - *common_packages
             - g++-5
+            - cuda-command-line-tools-8-0 cuda-cufft-dev-8-0 cuda-cublas-dev-8-0
       script: make CC=gcc-5 CXX=g++-5
     - compiler: clang-3.8
       addons:
@@ -35,18 +35,16 @@ matrix:
           packages:
             - *common_packages
             - clang-3.8
-      script: make CC=clang-3.8 CXX=clang++-3.8 $(grep -v openmp .kcf_builds)
+            - cuda-command-line-tools-8-0 cuda-cufft-dev-8-0 cuda-cublas-dev-8-0
+      script: make CC=clang-3.8 CXX=clang++-3.8 $(make print_BUILDS|grep -v openmp)
     - compiler: clang
       name: clang & test
       script:
-        - make BUILDS="$(echo $(grep -v cufft .kcf_builds))"
-        - ninja test
+        - make BUILDS="$(make print_BUILDS|grep -v cufft|paste -s)"
+        - LD_LIBRARY_PATH=/usr/local/clang-5.0.0/lib/ ninja test
       addons:
         apt: { sources: *common_sources, packages: [*common_packages, unzip] }
 
-before_script:
-    - make -qp|grep "^BUILDS ="|grep -o '[a-z-]*' | tee .kcf_builds
-
-before_cache: if [ -d vot2016 ]; then find -name output.txt -o -name core -print0 | xargs -0 rm -f; fi
+before_cache: rm -f vot2016/*/{output.txt,core}
 cache:
   directories: [ vot2016 ]