From 15f0a5ed52a7f6858ba9b7817b229c493e7b12f4 Mon Sep 17 00:00:00 2001 From: Adam Kosiorek Date: Fri, 25 Jul 2014 09:38:42 +0200 Subject: Examples_SOURCE_DIR cmake variable bugfix * it was set only when BUILD_EXAMPLES==OFF --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 1883c086..26d435b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,11 +50,11 @@ script: # CMake build. - mkdir build - cd build - ## CPU-GPU build + ## CPU-GPU: build only. - cmake -DBUILD_PYTHON=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release .. - make --keep-going --jobs=$NUM_THREADS - make clean && rm -rf * - ## CPU-only build + ## CPU-only: comprehensive - cmake -DBUILD_PYTHON=ON -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Release -DCPU_ONLY=ON .. - make --keep-going --jobs=$NUM_THREADS - cd test && ./test --gtest_shuffle --gtest_filter="-*GPU*" && cd - @@ -62,12 +62,13 @@ script: ## Cleaning - cd .. - rm -r build - - # CPU-GPU: build only. + + # Make build + ## CPU-GPU: build only. - export CPU_ONLY=0 - make --keep-going --jobs=$NUM_THREADS all - make clean - # CPU-only: comprehensive. + ## CPU-only: comprehensive. - export CPU_ONLY=1 - make --keep-going --jobs=$NUM_THREADS all test warn lint - make runtest -- cgit v1.2.3