Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix compiling of examples when cmake is used #2572

Merged
merged 2 commits into from
Sep 20, 2021

Conversation

JojoS62
Copy link
Contributor

@JojoS62 JojoS62 commented Sep 20, 2021

Description of the feature or fix

the lvgl repo fails to compile when cmake is used and target is not ESP, Zephyr or Micropython.
In this case, lvgl is built for a core and an example library. The core builds, the examples fail due to wrong include path in some asset files. Some asset.c files use correct ../../lvgl.h include, some are set to use the LV_LVGL_H_INCLUDE_SIMPLE define and use lvgl/lglv.h, which does not point to the include in the lvgl repo.

This PR chages the .c files in assets to use the LV_LVGL_H_INCLUDE_SIMPLE and ../../lvgl.h

Maybe it is even better that the files in assets use also the ../lv_examples.h include.

Checkpoints

@JojoS62 JojoS62 changed the title use INCLUDE_SIMPLE in all c sources fix compiling of examples when cmake is used Sep 20, 2021
@kisvegabor
Copy link
Member

As the example has fixed place using only #include "../../lvgl.h" is enough. What do you think?

@JojoS62
Copy link
Contributor Author

JojoS62 commented Sep 20, 2021

yes, I think also this will we enough. Maybe the define was used for some historical reasons?

@kisvegabor
Copy link
Member

Thank you, merging!

@kisvegabor kisvegabor merged commit a31f4b7 into lvgl:master Sep 20, 2021
kisvegabor pushed a commit that referenced this pull request Sep 20, 2021
* use INCLUDE_SIMPLE in all c sources

* removed unnecessary ifdef LV_LVGL_H_INCLUDE_SIMPLE
@JojoS62 JojoS62 deleted the fix-example_include_dirs branch October 9, 2021 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants