Skip to content
This repository was archived by the owner on Jan 7, 2023. It is now read-only.

Fixed unresolved xcb-dri3, remove LD_PRELOAD workaround #192

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions cmake/FindSinkDependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ function(FindWayland libs)
pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
pkg_check_modules(WAYLAND_CURSOR wayland-cursor)
if(WAYLAND_CLIENT_FOUND)
set(${libs} ${${libs}} ${WAYLAND_CLIENT_LIBRARIES} PARENT_SCOPE)
list(APPEND ${libs} ${WAYLAND_CLIENT_LIBRARIES})
include_directories (${WAYLAND_CLIENT_INCLUDE_DIRS})
pkg_check_modules (WESTON_4_0 weston>=3.0.0)
if (WESTON_4_0_FOUND)
Expand All @@ -11,7 +11,7 @@ function(FindWayland libs)
endif()

if(WAYLAND_CURSOR_FOUND)
set(${libs} ${${libs}} ${WAYLAND_CURSOR_LIBRARIES} PARENT_SCOPE)
list(APPEND ${libs} ${WAYLAND_CURSOR_LIBRARIES})
include_directories (${WAYLAND_CURSOR_INCLUDE_DIRS})
endif()
endfunction(FindWayland)
Expand All @@ -24,19 +24,19 @@ function(FindX11 libs)
pkg_check_modules(XRANDR xrandr)
pkg_check_modules(XRENDER xrender)
if(XCBDRI3_FOUND)
set(${libs} ${${libs}} ${XCBDRI3_LIBRARIES} PARENT_SCOPE)
include_directories (${XCBDRI3_INCLUDE_DIRS})
add_definitions(-DHAVE_XCBDRI3)
list(APPEND ${libs} ${XCBDRI3_LIBRARIES})
include_directories (${XCBDRI3_INCLUDE_DIRS})
add_definitions(-DHAVE_XCBDRI3)
endif()

if(XCBPRESENT_FOUND)
set(${libs} ${${libs}} ${XCBPRESENT_LIBRARIES} PARENT_SCOPE)
include_directories (${XCBPRESENT_INCLUDE_DIRS})
add_definitions(-DHAVE_XCBPRESENT)
list(APPEND ${libs} ${XCBPRESENT_LIBRARIES})
include_directories (${XCBPRESENT_INCLUDE_DIRS})
add_definitions(-DHAVE_XCBPRESENT)
endif()

if(X11_FOUND)
set(${libs} ${${libs}} ${X11_LIBRARIES} PARENT_SCOPE)
list(APPEND ${libs} ${X11_LIBRARIES})
include_directories (${X11_INCLUDE_DIRS})
endif()

Expand Down