Skip to content

Fix imgui not building on distros which don't have wayland headers on the default include path on Linux #904

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

Merged
azonenberg merged 1 commit into from
Sep 27, 2025
Merged

Fix imgui not building on distros which don't have wayland headers on the default include path on Linux #904

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ endif()
# We still use gtk on Linux for the file browser dialog in "native" mode)
if(LINUX)
pkg_check_modules(GTK QUIET IMPORTED_TARGET REQUIRED gtk+-3.0)
pkg_search_module(WAYLAND_CLIENT wayland-client IMPORTED_TARGET GLOBAL REQUIRED)
endif()

#WORKAROUND Fedora 38 does not include Threads from the glslang .cmake file, fixed in Fedora 39+
Expand Down
4 changes: 4 additions & 0 deletions src/ngscopeclient/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ target_include_directories(ngscopeclient
#Linker settings
if(LINUX)
set(PLATFORM_LIBS X11)
if(${WAYLAND_CLIENT_FOUND})
list(APPEND PLATFORM_LIBS ${WAYLAND_CLIENT_MODULE_NAME})
target_include_directories(ngscopeclient SYSTEM PRIVATE ${WAYLAND_CLIENT_INCLUDE_DIRS})
endif ()
else()
set(PLATFORM_LIBS "")
endif()
Expand Down
Loading