sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix travis with ccache (#6745)

Browse Source
This commit is contained in:
lbartoletti 2018-04-04 13:17:57 +02:00 committed by Denis Rouzaud
parent 9cece3e5ba
commit a213fad532
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/travis/code_layout/install.sh
View File

@ -18,6 +18,6 @@ export CORES=2
mkdir build mkdir build
pushd 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 popd

1
.ci/travis/linux/docker-build-test.sh
View File

@ -39,6 +39,7 @@ echo "travis_fold:start:cmake"
echo "${bold}Running cmake...${endbold}" echo "${bold}Running cmake...${endbold}"
cmake \ cmake \
-GNinja \ -GNinja \
-DUSE_CCACHE=OFF \
-DWITH_3D=ON \ -DWITH_3D=ON \
-DWITH_STAGED_PLUGINS=ON \ -DWITH_STAGED_PLUGINS=ON \
-DWITH_GRASS=OFF \ -DWITH_GRASS=OFF \

13
CMakeLists.txt
View File

@ -29,11 +29,14 @@ SET(CMAKE_COLOR_MAKEFILE ON)
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
# Configure CCache if available # Configure CCache if available
find_program(CCACHE_FOUND ccache) option(USE_CCACHE "Use ccache" ON)
if(CCACHE_FOUND) if (USE_CCACHE)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) find_program(CCACHE_FOUND ccache)
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) if(CCACHE_FOUND)
endif(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 # 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 # Note commented out since it cause problems but it would be nice to resolve these and enable