Fix CMake PATH parser for Windows #100
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The zephyr-build DTS parser fails on Windows, due to the "\r\n" whitespace used on that platform. Accept the "\r" in addition to the "\n" to allow it to parse successfully. Fixes: zephyrproject-rtos#68 See: zephyrproject-rtos#68 Signed-off-by: coskun ergan <[email protected]>
…r stm32 series. The zephyr-build parser was missing aux_display support, which was included and used in a demo; https://github.com/coskunergan/zephyr_rust_demo Signed-off-by: coskun ergan <[email protected]>
# Conflicts: # zephyr-sys/wrapper.h
# Conflicts: # zephyr-sys/wrapper.h
coskunergan
force-pushed
the
main
branch
2 times, most recently
from
d17aa5c to
574968f
Compare
coskunergan
force-pushed
the
main
branch
2 times, most recently
from
374f819 to
06ddc29
Compare
…rectly. The build system encountered an error during compilation of the Esp32c3 (RISC-V) module on Windows. The issue was traced to incorrect handling of "/../" (parent folder path) in folder addresses within the "always-run-cargo.dummy-baee278.bat" file used by CMake. This fix resolves the issue, enabling successful compilation. Signed-off-by: Coskun Ergan <[email protected]>
|
This might be a consequence of this having the wrong base, but github is including numerous changes in this that aren't part of the cmake fix. I can try a rebase and see if that resolves things. |
|
Ok, so it looks like the single commit of this change is on top of a merge commit. But, there are also stray changes to gpio and board support within that single commit. In addition, can you please format the commit text so that the lines are no longer than 75 characters. Thanks, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pull request addresses a compilation error encountered when building the Esp32c3 (RISC-V) module on Windows using the CMake build system. The issue originated from improper handling of parent folder paths (
/../) in folder addresses specified within thealways-run-cargo.dummy-baee278.batfile, which is utilized by CMake during the build process.Problem
The build system failed during compilation of the Esp32c3 module on Windows due to improper resolution of paths containing /../ in always-run-cargo.dummy-baee278.bat and the get_include_dirs function in CMakeLists.txt. These paths caused CMake to misinterpret directory references, resulting in build failures.
Examples of problematic paths include:
C:/zephyr/zephyrproject/modules/hal/espressif/zephyr/esp32c3/../esp_shared/includeC:/zephyr/zephyrproject/modules/hal/espressif/zephyr/esp32c3/../esp_shared/components/includeC:/zephyr/zephyrproject/modules/hal/espressif/zephyr/esp32c3/../../components/efuse/includeThe correct paths should be:
C:/zephyr/zephyrproject/modules/hal/espressif/zephyr/esp_shared/includeC:/zephyr/zephyrproject/modules/hal/espressif/zephyr/esp_shared/components/includeC:/zephyr/zephyrproject/modules/hal/espressif/components/efuse/includeSolution
This fix updates always-run-cargo.dummy-xxx.bat to use fully resolved paths and modifies the get_include_dirs function in CMakeLists.txt to properly handle /../ paths, ensuring CMake can accurately locate the necessary directories. These changes enable successful compilation of the Esp32c3 module on Windows.