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

CMake: Remove USE_WAYLAND option #3851

Merged
merged 3 commits into from
Mar 4, 2024
Merged

Conversation

M374LX
Copy link
Contributor

@M374LX M374LX commented Mar 1, 2024

With GLFW now having both X11 and Wayland enabled by default, the USE_WAYLAND CMake option is no longer necessary.

Setting GLFW's own CMake options GLFW_BUILD_X11 and GLFW_BUILD_WAYLAND to OFF allows either to be disabled.

This PR additionally includes a check to prevent both from being disabled.

@raysan5
Copy link
Owner

raysan5 commented Mar 1, 2024

@M374LX Thanks for the review! It seems this change is generating some issues in the CI build system...

@M374LX
Copy link
Contributor Author

M374LX commented Mar 1, 2024

@raysan5 The CI fails with the message:

Failed to find wayland-scanner

This means that the wayland-scanner utility is missing in the machine that runs the build test, but installing it should fix the problem. On Debian, for instance, the package to be installed is libwayland-bin.

@Peter0x44
Copy link
Contributor

sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev

Adding libwayland-bin here would be the solution, I guess.

But now I'm questioning - doesn't the Makefile need this too?

@raysan5 raysan5 merged commit 85a46e4 into raysan5:master Mar 4, 2024
1 of 3 checks passed
@raysan5
Copy link
Owner

raysan5 commented Mar 4, 2024

@M374LX Added libwayland-bin to CI system for linux builds.

@Peter0x44 Afair, Makefile does not manage those deps, are expected to be installed in the system by user.

@Peter0x44
Copy link
Contributor

@raysan5 I was talking about the ci system for the makefile

@raysan5
Copy link
Owner

raysan5 commented Mar 4, 2024

@Peter0x44 Oh, ok, I think I already modified it. Just reviewed CMake build CI.

@M374LX
Copy link
Contributor Author

M374LX commented Mar 5, 2024

@Peter0x44 There is a deeper issue affecting the Makefile and the Zig build system (#3850), which I plan to review too.

@M374LX M374LX deleted the cmake-x11-wl branch March 5, 2024 00:24
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.

3 participants