From 26b249061ee49dacc29320f93984de3d35012e1f Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Tue, 5 Jan 2021 23:06:32 +0200 Subject: [PATCH] cmake: Remove FindUDev.cmake It's in extra-cmake-modules now. --- CMakeLists.txt | 2 +- autotests/libinput/CMakeLists.txt | 1 - cmake/modules/FindUDev.cmake | 28 ---------------------------- tests/CMakeLists.txt | 2 +- 4 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 cmake/modules/FindUDev.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b92c35ea0..26c40d4410 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -661,7 +661,7 @@ set(kwinLibs ${kwin_XLIB_LIBS} ${kwin_XCB_LIBS} ${kwin_WAYLAND_LIBS} - ${UDEV_LIBS} + UDev::UDev Libinput::Libinput ) diff --git a/autotests/libinput/CMakeLists.txt b/autotests/libinput/CMakeLists.txt index 4ac4d2580b..3706367d90 100644 --- a/autotests/libinput/CMakeLists.txt +++ b/autotests/libinput/CMakeLists.txt @@ -1,5 +1,4 @@ include_directories(${Libinput_INCLUDE_DIRS}) -include_directories(${UDEV_INCLUDE_DIR}) add_library(LibInputTestObjects STATIC ../../libinput/device.cpp ../../libinput/events.cpp mock_libinput.cpp) target_link_libraries(LibInputTestObjects Qt5::Test Qt5::Widgets Qt5::DBus Qt5::Gui KF5::ConfigCore) diff --git a/cmake/modules/FindUDev.cmake b/cmake/modules/FindUDev.cmake deleted file mode 100644 index d74e05d487..0000000000 --- a/cmake/modules/FindUDev.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# - Try to find the UDev library -# Once done this will define -# -# UDEV_FOUND - system has UDev -# UDEV_INCLUDE_DIR - the libudev include directory -# UDEV_LIBS - The libudev libraries - -# SPDX-FileCopyrightText: 2010 Rafael Fernández López -# -# SPDX-License-Identifier: BSD-3-Clause - -find_path(UDEV_INCLUDE_DIR libudev.h) -find_library(UDEV_LIBS udev) - -if(UDEV_INCLUDE_DIR AND UDEV_LIBS) - include(CheckFunctionExists) - include(CMakePushCheckState) - cmake_push_check_state() - set(CMAKE_REQUIRED_LIBRARIES ${UDEV_LIBS} ) - - cmake_pop_check_state() - -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(UDev DEFAULT_MSG UDEV_INCLUDE_DIR UDEV_LIBS) - -mark_as_advanced(UDEV_INCLUDE_DIR UDEV_LIBS) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 58466f6d98..e52e68e44b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -21,7 +21,7 @@ set(libinputtest_SRCS ) add_executable(libinputtest ${libinputtest_SRCS}) add_definitions(-DKWIN_BUILD_TESTING) -target_link_libraries(libinputtest Qt5::Core Qt5::DBus Libinput::Libinput ${UDEV_LIBS} KF5::ConfigCore KF5::GlobalAccel KF5::WindowSystem) +target_link_libraries(libinputtest Qt5::Core Qt5::DBus Libinput::Libinput UDev::UDev KF5::ConfigCore KF5::GlobalAccel KF5::WindowSystem) add_executable(x11shadowreader x11shadowreader.cpp) target_link_libraries(x11shadowreader XCB::XCB Qt5::Widgets Qt5::X11Extras KF5::ConfigCore KF5::WindowSystem)