From a213fad532bda65d3a4089acdf9f4027f0d2a828 Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Wed, 4 Apr 2018 13:17:57 +0200 Subject: [PATCH] Fix travis with ccache (#6745) --- .ci/travis/code_layout/install.sh | 2 +- .ci/travis/linux/docker-build-test.sh | 1 + CMakeLists.txt | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.ci/travis/code_layout/install.sh b/.ci/travis/code_layout/install.sh index 9443f857194..9bb26a5da54 100755 --- a/.ci/travis/code_layout/install.sh +++ b/.ci/travis/code_layout/install.sh @@ -18,6 +18,6 @@ export CORES=2 mkdir build pushd build -cmake -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON .. +cmake -DUSE_CCACHE=OFF -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON .. popd diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh index 761810d1453..1453171c358 100755 --- a/.ci/travis/linux/docker-build-test.sh +++ b/.ci/travis/linux/docker-build-test.sh @@ -39,6 +39,7 @@ echo "travis_fold:start:cmake" echo "${bold}Running cmake...${endbold}" cmake \ -GNinja \ + -DUSE_CCACHE=OFF \ -DWITH_3D=ON \ -DWITH_STAGED_PLUGINS=ON \ -DWITH_GRASS=OFF \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 59a64dc38ba..357224ad21d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,11 +29,14 @@ SET(CMAKE_COLOR_MAKEFILE ON) SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) # Configure CCache if available -find_program(CCACHE_FOUND ccache) -if(CCACHE_FOUND) - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) - set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) -endif(CCACHE_FOUND) +option(USE_CCACHE "Use ccache" ON) +if (USE_CCACHE) + find_program(CCACHE_FOUND ccache) + if(CCACHE_FOUND) + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) + endif(CCACHE_FOUND) +endif() # in generated makefiles use relative paths so the project dir is moveable # Note commented out since it cause problems but it would be nice to resolve these and enable