feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/update_cmake' into 'master'

Browse Source 
[Tools] Update CMake and CCache version

Closes IDFGH-5329

See merge request espressif/esp-idf!13830
This commit is contained in:
Roland Dobai
2021-07-26 14:54:12 +00:00
parent 47c4e5d63e 1e5a2f92c3
commit aa05c05858
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/build_system/cmake/idf_as_lib/CMakeLists.txt
View File

@@ -23,6 +23,8 @@ else()
add_subdirectory(stubs/spi_flash) add_subdirectory(stubs/spi_flash)
endif() endif()
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(elf_file ${CMAKE_PROJECT_NAME}.elf) set(elf_file ${CMAKE_PROJECT_NAME}.elf)
add_executable(${elf_file} main.c) add_executable(${elf_file} main.c)
@@ -35,5 +37,3 @@ if("${TARGET}" STREQUAL "esp32")
else() else()
target_link_libraries(${elf_file} stub::esp32 stub::freertos stub::spi_flash) target_link_libraries(${elf_file} stub::esp32 stub::freertos stub::spi_flash)
endif() endif()
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)

2
tools/cmake/project.cmake
View File

@@ -273,7 +273,7 @@ macro(project project_name)
__project(${project_name} C CXX ASM) __project(${project_name} C CXX ASM)
# Generate compile_commands.json (needs to come after project call). # Generate compile_commands.json (needs to come after project call).
set(CMAKE_EXPORT_COMPILE_COMMANDS 1) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Since components can import third-party libraries, the original definition of project() should be restored # Since components can import third-party libraries, the original definition of project() should be restored
# before the call to add components to the build. # before the call to add components to the build.

36
tools/tools.json
View File

@@ -403,26 +403,26 @@
"versions": [ "versions": [
{ {
"linux-amd64": { "linux-amd64": {
"sha256": "12a577aa04b6639766ae908f33cf70baefc11ac4499b8b1c8812d99f05fb6a02", "sha256": "97bf730372f9900b2dfb9206fccbcf92f5c7f3b502148b832e77451aa0f9e0e6",
"size": 39517697, "size": 43877847,
"url": "https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Linux-x86_64.tar.gz" "url": "https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3-Linux-x86_64.tar.gz"
}, },
"macos": { "macos": {
"sha256": "f60e0ef96da48725cd8da7d6abe83cd9501167aa51625c90dd4d31081a631279", "sha256": "5f72dba3aa5f3800fb29ab6115ae0b31f10bdb2aad66204e14c98f6ac7e6b6ed",
"size": 35802699, "size": 66311879,
"url": "https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-Darwin-x86_64.tar.gz" "url": "https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3-macos-universal.tar.gz"
}, },
"name": "3.16.4", "name": "3.20.3",
"status": "recommended", "status": "recommended",
"win32": { "win32": {
"sha256": "f37963bcfcebdfe5864926a3623f6c21220c35790c39cd65e64bd521cbb39c55", "sha256": "e276cf7fbb3e3e88bc666e183bc3ddaceb143a4c83fb357b1dbb1a26fd6e4ea2",
"size": 32812189, "size": 36995168,
"url": "https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-win64-x64.zip" "url": "https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3-windows-x86_64.zip"
}, },
"win64": { "win64": {
"sha256": "f37963bcfcebdfe5864926a3623f6c21220c35790c39cd65e64bd521cbb39c55", "sha256": "e276cf7fbb3e3e88bc666e183bc3ddaceb143a4c83fb357b1dbb1a26fd6e4ea2",
"size": 32812189, "size": 36995168,
"url": "https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-win64-x64.zip" "url": "https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3-windows-x86_64.zip"
} }
} }
] ]
@@ -591,7 +591,7 @@
"description": "Ccache (compiler cache)", "description": "Ccache (compiler cache)",
"export_paths": [ "export_paths": [
[ [
"" "ccache-4.3-windows-64"
] ]
], ],
"export_vars": { "export_vars": {
@@ -619,12 +619,12 @@
"version_regex": "ccache version ([0-9.]+)", "version_regex": "ccache version ([0-9.]+)",
"versions": [ "versions": [
{ {
"name": "3.7", "name": "4.3",
"status": "recommended", "status": "recommended",
"win64": { "win64": {
"sha256": "37e833f3f354f1145503533e776c1bd44ec2e77ff8a2476a1d2039b0b10c78d6", "sha256": "a9cacae73c3906d8193456328bee74f7748cb1559a32eaced9ee78eadd416105",
"size": 142401, "size": 1550675,
"url": "https://dl.espressif.com/dl/ccache-3.7-w64.zip" "url": "https://github.com/ccache/ccache/releases/download/v4.3/ccache-4.3-windows-64.zip"
} }
} }
] ]