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

refactor(cmake) : remove dependence of wayland when not use it #252

Open
wants to merge 7 commits into
base: master
Choose a base branch
from

Conversation

HR1025
Copy link
Contributor

@HR1025 HR1025 commented Nov 12, 2022

No description provided.

王浩锐 and others added 5 commits November 4, 2022 17:21
@HR1025
Copy link
Contributor Author

HR1025 commented Nov 12, 2022

[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

@HR1025
Copy link
Contributor Author

HR1025 commented Nov 12, 2022

This merge combine CMakeLists.txt with wayland/CMakeLists.txt to make them work together.

Thank to @WallaceIT for previous wayland/CMakeLists.txt.

Many implementations refer to it.

Copy link
Contributor

@WallaceIT WallaceIT left a 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!

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)
Copy link
Contributor

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modified already

@@ -0,0 +1,61 @@
project(lv_wayland)

option(USE_WL_SHELL "use wl shell (discard, no recommend)" OFF)
Copy link
Contributor

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)"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modified already

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)")
Copy link
Contributor

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)"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modified already

@HR1025
Copy link
Contributor Author

HR1025 commented Nov 12, 2022

Thank you for your advice. I will revise them.

@stale
Copy link

stale bot commented Apr 20, 2023

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.

@stale stale bot added the stale label Apr 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants