Skip to content

macOS: skip loginctl X11/Wayland probe (UNIX is also true on Apple) #11

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.

Sign up for GitHub

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

Draft
scasekar wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

macOS: skip loginctl X11/Wayland probe (UNIX is also true on Apple) #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,16 @@ endif()
set(WGPU_USE_X11 OFF)
set(WGPU_USE_WAYLAND OFF)

# Check if display server is x11 or wayland
if (UNIX)
# Check if display server is x11 or wayland.
# Gated on "NOT APPLE" because in CMake, APPLE is a subset of UNIX, but macOS
# uses Metal (or Vulkan via MoltenVK) — never X11/Wayland. Without this guard,
# `loginctl` is missing on macOS so the wayland probe returns empty, the
# `else ()` branch fires, and WGPU_USE_X11 is set TRUE. That then propagates
# into libraries/webgpu/cmake/FetchDawn.cmake which LOCAL-sets DAWN_USE_X11=ON,
# overriding any cache-level setting. Downstream Dawn sources (e.g.
# native/vulkan/Instance.cpp) then include X11Functions.h whose
# xlib_with_undefs.h `#error`s on non-Linux, breaking the build.
if (UNIX AND NOT APPLE)
execute_process(
COMMAND bash -c [=[loginctl show-session $(loginctl user-status $USER | grep -E -m 1 'session-[0-9]+\.scope' | sed -E 's/^.*?session-([0-9]+)\.scope.*$/\1/') -p Type | grep -ic wayland]=]
OUTPUT_VARIABLE is_wayland
Expand Down