mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -04:00
1ca9e63e79
Extend target checks in cmake, in case it's run directly and not via
idf.py or if idf.py misses something. This may happen
for example if cmake variables are set in project's CMakeLists.txt.
Some clean-ups are included along with the new checks and tests.
1. __target_check() function is removed. IIUC it should never fail,
because the selected target is explicitly passed as environmental
variable to kconfgen. Meaning the IDF_TARGET from environment variable may
not be actually used in kconfgen if IDF_TARGET is already set it cmake cache.
Note that the IDF_TARGET environment variable used for kconfgen is not
based on the actual IDF_TARGET environment variable set for idf.py, but
rather on the value set in __target_init() with
set(IDF_TARGET ${env_idf_target} CACHE STRING "IDF Build Target")
My understanding is that the original check was introduced to handle
situation, where IDF_TARGET was already set in cmake's cache and
the IDF_TARGET from environment variable was different. Since
the kconfgen would use the original environment variable(not
explicitly passed as it is now) the IDF_TARGET in cmake and in
sdkconfig could differ. IOW I think the original check was introduced
to cope with the following cmake behaviour
set(VARIABLE "value1" CACHE STRING "test variable")
set(VARIABLE "value2" CACHE STRING "test variable")
message("Variable value: ${VARIABLE}")
output: Variable value: value1
2. I scratched by head how it is possible that the following code
in __target_check()
if(NOT ${IDF_TARGET} STREQUAL ${env_idf_target})
could fail if IDF_TARGET is not set. For example in clean project
IDF_TARGET=esp32 idf.py reconfigure
Here env_idf_target==esp32 and IDF_TARGET is not set, so I would
expect that cmake will fail with error message that the cache
and env target do not match. The thing is that the variable
evaluation is done before the if command, so it actually
sees this
if(NOT STREQUAL esp32)
which is false and the error is not printed. It can be seen
with 'cmake --trace-expand' command. I don't know if this
was used on purpose or it worked just as a coincidence, but
I find it very confusing, so I added explicit check if the
IDF_TARGET is defined before the actual check. Same for
CMAKE_TOOLCHAIN_FILE.
3. Error messages are not formated(line-wrapped) by cmake's markup
so it's easier to check the output in tests.
Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
|
||
|---|---|---|
| .. | ||
| ble | ||
| catch | ||
| ci | ||
| cmake | ||
| docker | ||
| esp_app_trace | ||
| esp_prov | ||
| gen_soc_caps_kconfig | ||
| idf_py_actions | ||
| idf_size_yaml | ||
| kconfig_new | ||
| ldgen | ||
| mass_mfg | ||
| mocks | ||
| requirements | ||
| templates/sample_component | ||
| test_apps | ||
| test_build_system | ||
| test_idf_py | ||
| test_idf_size | ||
| test_idf_tools | ||
| test_mkdfu | ||
| test_mkuf2 | ||
| unit-test-app | ||
| check_python_dependencies.py | ||
| check_term.py | ||
| detect_python.fish | ||
| detect_python.sh | ||
| eclipse-code-style.xml | ||
| format-minimal.sh | ||
| format.sh | ||
| gdb_panic_server.py | ||
| gen_esp_err_to_name.py | ||
| generate_debug_prefix_map.py | ||
| idf_monitor.py | ||
| idf_size.py | ||
| idf_tools.py | ||
| idf.py | ||
| install_util.py | ||
| mkdfu.py | ||
| mkuf2.py | ||
| python_version_checker.py | ||
| requirements_schema.json | ||
| requirements.json | ||
| set-submodules-to-github.sh | ||
| split_paths_by_spaces.py | ||
| tools_schema.json | ||
| tools.json | ||