From 978e89879cdbc749a826574ce331175ca581d4b4 Mon Sep 17 00:00:00 2001 From: Rashad Kanavath <rashad.kanavath@c-s.fr> Date: Fri, 13 May 2016 15:21:55 +0200 Subject: [PATCH] TRAVIS: enable ccache --- .travis.yml | 2 +- Utilities/Maintenance/TravisBuild.cmake | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05a12124f2..46aea29320 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,6 @@ dist: trusty compiler: - clang -cache: false +cache: ccache script: Utilities/Maintenance/TravisBuild.sh diff --git a/Utilities/Maintenance/TravisBuild.cmake b/Utilities/Maintenance/TravisBuild.cmake index 44e0c18b92..0b6513fe1c 100644 --- a/Utilities/Maintenance/TravisBuild.cmake +++ b/Utilities/Maintenance/TravisBuild.cmake @@ -36,6 +36,11 @@ set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 1000) set(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 300) #set(CTEST_BUILD_FLAGS -j2) +macro(do_submit) + ctest_submit() + return() +endmacro() + message(STATUS "CTEST_SOURCE_DIRECTORY: ${CTEST_SOURCE_DIRECTORY}") message(STATUS "CTEST_BINARY_DIRECTORY: ${CTEST_BINARY_DIRECTORY}") @@ -85,15 +90,8 @@ if(NOT _build_rv EQUAL 0) do_submit() endif () -#ctest_test with extra verbose is annoying in travis build log. -#Afer all these are unit-test without much revelent extra verbose output execute_process(COMMAND ${CTEST_COMMAND} "-R" "Tu" "." WORKING_DIRECTORY "${CTEST_BINARY_DIRECTORY}" ) do_submit() - -macro(do_submit) - ctest_submit() - return() -endmacro() -- GitLab