-
Notifications
You must be signed in to change notification settings - Fork 315
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
refactor(cmake) : remove dependence of wayland when not use it #252
base: master
Are you sure you want to change the base?
Conversation
[how] 1. move wayland related Cmake to `cmake/wayland_driver.cmake` 2. use option to choose whether build or not wayland 3. add build directory to git ignore
[how]
|
This merge combine Thank to @WallaceIT for previous
|
…URSE SOURCES ./*.c)`
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 for this approach. I left one bug warning and a couple of comments, but otherwise seems good to me.
Thank you!
cmake/wayland_driver.cmake
Outdated
execute_process(COMMAND "${WAYLAND_SCANNER_EXECUTABLE}" private-code "${protocol_xml_file}" "${xdg_shell_file}.c") | ||
endmacro() | ||
|
||
if (NOT USE_WL_SHELL AND USE_XDG_SHELL) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here you have a bug, it should be:
if (NOT USE_WL_SHELL AND NOT USE_XDG_SHELL)
Otherwise, enabling only XDG shell would trigger the FATAL_ERROR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
modified already
cmake/wayland_driver.cmake
Outdated
@@ -0,0 +1,61 @@ | |||
project(lv_wayland) | |||
|
|||
option(USE_WL_SHELL "use wl shell (discard, no recommend)" OFF) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rephrase the comment as:
"use wl_shell (deprecated, not recommended)"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
modified already
cmake/wayland_driver.cmake
Outdated
endmacro() | ||
|
||
if (NOT USE_WL_SHELL AND USE_XDG_SHELL) | ||
message(FATAL_ERROR "Please select at least one of USE_WL_SHELL and USE_XDG_SHELL (that is, can both select)") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rephrase the comment as follows:
"Please select at least one of USE_WL_SHELL and USE_XDG_SHELL (multiple choices allowed)"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
modified already
Thank you for your advice. I will revise them. |
chore(wayland) : improve some descriptions
This issue or pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. |
No description provided.