Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/restore_ccache_use' into 'release/v3.3'

Browse source 
CMake : Restore ccache use (backport v3.3)

See merge request idf/esp-idf!4985
This commit is contained in:
Angus Gratton 2019-06-11 09:03:54 +08:00
parent a3b3f9ae2d 261c5bf6a8
commit 871e95087e
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/ci/test_build_system_cmake.sh
View file

@ -372,6 +372,13 @@ EOF
grep "$PWD/components/bootloader/subproject/main/bootloader_start.c" build/bootloader/compile_commands.json \
|| failure "Custom bootloader source files should be built instead of the original's"
rm -rf components
print_status "Check ccache is used to build when present"
touch ccache && chmod +x ccache # make sure that ccache is present for this test
(export PATH=$PWD:$PATH && idf.py reconfigure | grep "ccache will be used for faster builds") || failure "ccache should be used when present"
(export PATH=$PWD:$PATH && idf.py reconfigure --no-ccache | grep -c "ccache will be used for faster builds" | grep -wq 0) \
|| failure "ccache should not be used even when present if --no-ccache is specified"
rm -f ccache
print_status "All tests completed"
if [ -n "${FAILURES}" ]; then

9
tools/cmake/project.cmake
View file

@ -83,6 +83,15 @@ macro(project name)
# Now the configuration is loaded, set the toolchain appropriately
idf_set_toolchain()
# Enable ccache if it's on the path
if(NOT CCACHE_DISABLE)
find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND)
message(STATUS "ccache will be used for faster builds")
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
endif()
endif()
__project(${name} C CXX ASM)
set(IDF_BUILD_ARTIFACTS ON)