From 745318496b4b627df82250466f1da65029b212cc Mon Sep 17 00:00:00 2001 From: "Phoong, Stanley Cheong Kwan" Date: Mon, 26 Apr 2021 21:00:09 +0800 Subject: [PATCH] Fixed unresolved xcb-dri3, forcing LD_PRELOAD workaround The appending of the library in the CMakeLists wasn't set correctly. This fix will append the LIBRARIES in the CMake for XCB to ${libs} properly Resolves: - https://github.com/intel/gstreamer-media-SDK/issues/178 - https://github.com/intel/gstreamer-media-SDK/pull/175 Signed-off-by: Phoong, Stanley Cheong Kwan --- cmake/FindSinkDependencies.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cmake/FindSinkDependencies.cmake b/cmake/FindSinkDependencies.cmake index b909ba8b..77c47726 100644 --- a/cmake/FindSinkDependencies.cmake +++ b/cmake/FindSinkDependencies.cmake @@ -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) @@ -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) @@ -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()