From f8befe423d8d0123b67d65d3be180ee616cac2fa Mon Sep 17 00:00:00 2001 From: Philipp Kerling Date: Wed, 1 Aug 2018 08:25:27 +0200 Subject: [wayland] Do not link wayland-client-extra++ This dependency was introduced erroneously when the CMake module was changed, we do not actually need it and it seems to cause problems on shutdown. --- cmake/modules/FindWaylandpp.cmake | 6 ------ 1 file changed, 6 deletions(-) (limited to 'cmake') diff --git a/cmake/modules/FindWaylandpp.cmake b/cmake/modules/FindWaylandpp.cmake index fa63ec1b0a..3cfc282730 100644 --- a/cmake/modules/FindWaylandpp.cmake +++ b/cmake/modules/FindWaylandpp.cmake @@ -24,9 +24,6 @@ find_path(WAYLANDPP_INCLUDE_DIR wayland-client.hpp PATHS ${PC_WAYLANDPP_INCLUDED find_library(WAYLANDPP_CLIENT_LIBRARY NAMES wayland-client++ PATHS ${PC_WAYLANDPP_LIBRARY_DIRS}) -find_library(WAYLANDPP_CLIENT_EXTRA_LIBRARY NAMES wayland-client-extra++ - PATHS ${PC_WAYLANDPP_LIBRARY_DIRS}) - find_library(WAYLANDPP_CURSOR_LIBRARY NAMES wayland-cursor++ PATHS ${PC_WAYLANDPP_LIBRARY_DIRS}) @@ -45,7 +42,6 @@ include (FindPackageHandleStandardArgs) find_package_handle_standard_args(Waylandpp REQUIRED_VARS WAYLANDPP_INCLUDE_DIR WAYLANDPP_CLIENT_LIBRARY - WAYLANDPP_CLIENT_EXTRA_LIBRARY WAYLANDPP_CURSOR_LIBRARY WAYLANDPP_EGL WAYLANDPP_SCANNER @@ -54,7 +50,6 @@ find_package_handle_standard_args(Waylandpp if(WAYLANDPP_FOUND) set(WAYLANDPP_INCLUDE_DIRS ${WAYLANDPP_INCLUDE_DIR}) set(WAYLANDPP_LIBRARIES ${WAYLANDPP_CLIENT_LIBRARY} - ${WAYLANDPP_CLIENT_EXTRA_LIBRARY} ${WAYLANDPP_CURSOR_LIBRARY} ${WAYLANDPP_EGL}) set(WAYLANDPP_DEFINITIONS -DHAVE_WAYLAND=1) @@ -62,6 +57,5 @@ endif() mark_as_advanced(WAYLANDPP_INCLUDE_DIR WAYLANDPP_CLIENT_LIBRARY - WAYLANDPP_CLIENT_EXTRA_LIBRARY WAYLANDPP_CURSOR_LIBRARY WAYLANDPP_EGL WAYLANDPP_SCANNER) -- cgit v1.2.3