mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/restore_ccache_use' into 'master'
CMake : Restore ccache use Closes IDFGH-673 See merge request idf/esp-idf!4944
This commit is contained in:
commit
b4979f9c2a
@ -393,7 +393,13 @@ endmenu\n" >> ${IDF_PATH}/Kconfig;
|
||||
pushd ${IDF_PATH}
|
||||
git checkout -- sdkconfig.rename Kconfig
|
||||
popd
|
||||
idf.py build
|
||||
|
||||
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
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user