cmake: Remove custom find_package code

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 029f9c3..47a14b8 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -100,7 +100,7 @@ jobs:
               run: |-
                 sudo dpkg --add-architecture i386
                 sudo apt-get update
-                sudo apt install --yes --no-install-recommends gcc-multilib g++-multilib libc6-dev-i386 pkg-config-i686-linux-gnu libwayland-dev:i386 libxrandr-dev:i386 libx11-dev:i386
+                sudo apt install --yes --no-install-recommends gcc-multilib g++-multilib libc6-dev-i386 pkg-config-i686-linux-gnu libwayland-dev:i386 libxrandr-dev:i386
             - name: Generate build files
               run: cmake -S. -B build -D CMAKE_BUILD_TYPE=${{matrix.config}} -D BUILD_TESTS=ON -D UPDATE_DEPS=ON
               env:
@@ -108,7 +108,6 @@ jobs:
                 CXXFLAGS: -m32
                 LDFLAGS: -m32
                 ASFLAGS: --32
-                PKG_CONFIG: i686-pc-linux-gnu-pkg-config
 
             - name: Build the loader
               run: cmake --build build

diff --git a/cmake/Copyright_cmake.txt b/cmake/Copyright_cmake.txt
deleted file mode 100644 (file)
index 743c634..0000000
--- a/cmake/Copyright_cmake.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-CMake - Cross Platform Makefile Generator
-Copyright 2000-2018 Kitware, Inc. and Contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-
-* Neither the name of Kitware, Inc. nor the names of Contributors
-  may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-------------------------------------------------------------------------------
-
-The following individuals and institutions are among the Contributors:
-
-* Aaron C. Meadows <cmake@shadowguarddev.com>
-* Adriaan de Groot <groot@kde.org>
-* Aleksey Avdeev <solo@altlinux.ru>
-* Alexander Neundorf <neundorf@kde.org>
-* Alexander Smorkalov <alexander.smorkalov@itseez.com>
-* Alexey Sokolov <sokolov@google.com>
-* Alex Turbov <i.zaufi@gmail.com>
-* Andreas Pakulat <apaku@gmx.de>
-* Andreas Schneider <asn@cryptomilk.org>
-* André Rigland Brodtkorb <Andre.Brodtkorb@ifi.uio.no>
-* Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
-* Benjamin Eikel
-* Bjoern Ricks <bjoern.ricks@gmail.com>
-* Brad Hards <bradh@kde.org>
-* Christopher Harvey
-* Christoph Grüninger <foss@grueninger.de>
-* Clement Creusot <creusot@cs.york.ac.uk>
-* Daniel Blezek <blezek@gmail.com>
-* Daniel Pfeifer <daniel@pfeifer-mail.de>
-* Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-* Eran Ifrah <eran.ifrah@gmail.com>
-* Esben Mose Hansen, Ange Optimization ApS
-* Geoffrey Viola <geoffrey.viola@asirobots.com>
-* Google Inc
-* Gregor Jasny
-* Helio Chissini de Castro <helio@kde.org>
-* Ilya Lavrenov <ilya.lavrenov@itseez.com>
-* Insight Software Consortium <insightsoftwareconsortium.org>
-* Jan Woetzel
-* Kelly Thompson <kgt@lanl.gov>
-* Konstantin Podsvirov <konstantin@podsvirov.pro>
-* Mario Bensi <mbensi@ipsquad.net>
-* Mathieu Malaterre <mathieu.malaterre@gmail.com>
-* Matthaeus G. Chajdas
-* Matthias Kretz <kretz@kde.org>
-* Matthias Maennich <matthias@maennich.net>
-* Michael Stürmer
-* Miguel A. Figueroa-Villanueva
-* Mike Jackson
-* Mike McQuaid <mike@mikemcquaid.com>
-* Nicolas Bock <nicolasbock@gmail.com>
-* Nicolas Despres <nicolas.despres@gmail.com>
-* Nikita Krupen'ko <krnekit@gmail.com>
-* NVIDIA Corporation <www.nvidia.com>
-* OpenGamma Ltd. <opengamma.com>
-* Patrick Stotko <stotko@cs.uni-bonn.de>
-* Per Øyvind Karlsen <peroyvind@mandriva.org>
-* Peter Collingbourne <peter@pcc.me.uk>
-* Petr Gotthard <gotthard@honeywell.com>
-* Philip Lowman <philip@yhbt.com>
-* Philippe Proulx <pproulx@efficios.com>
-* Raffi Enficiaud, Max Planck Society
-* Raumfeld <raumfeld.com>
-* Roger Leigh <rleigh@codelibre.net>
-* Rolf Eike Beer <eike@sf-mail.de>
-* Roman Donchenko <roman.donchenko@itseez.com>
-* Roman Kharitonov <roman.kharitonov@itseez.com>
-* Ruslan Baratov
-* Sebastian Holtermann <sebholt@xwmw.org>
-* Stephen Kelly <steveire@gmail.com>
-* Sylvain Joubert <joubert.sy@gmail.com>
-* Thomas Sondergaard <ts@medical-insight.com>
-* Tobias Hunger <tobias.hunger@qt.io>
-* Todd Gamblin <tgamblin@llnl.gov>
-* Tristan Carel
-* University of Dundee
-* Vadim Zhukov
-* Will Dicharry <wdicharry@stellarscience.com>
-
-See version control history for details of individual contributions.
-
-The above copyright and license notice applies to distributions of
-CMake in source and binary form.  Third-party software packages supplied
-with CMake under compatible licenses provide their own copyright notices
-documented in corresponding subdirectories or source files.
-
-------------------------------------------------------------------------------
-
-CMake was initially developed by Kitware with the following sponsorship:
-
- * National Library of Medicine at the National Institutes of Health
-   as part of the Insight Segmentation and Registration Toolkit (ITK).
-
- * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
-   Visualization Initiative.
-
- * National Alliance for Medical Image Computing (NAMIC) is funded by the
-   National Institutes of Health through the NIH Roadmap for Medical Research,
-   Grant U54 EB005149.
-
- * Kitware, Inc.

diff --git a/cmake/FindDirectFB.cmake b/cmake/FindDirectFB.cmake
deleted file mode 100644 (file)
index 2c98b2a..0000000
--- a/cmake/FindDirectFB.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# Try to find DirectFB
-#
-# This will define:
-#
-#   DIRECTFB_FOUND       - True if DirectFB is found
-#   DIRECTFB_LIBRARIES   - Link these to use DirectFB
-#   DIRECTFB_INCLUDE_DIR - Include directory for DirectFB
-#   DIRECTFB_DEFINITIONS - Compiler flags for using DirectFB
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-IF (NOT WIN32)
-  FIND_PACKAGE(PkgConfig)
-  PKG_CHECK_MODULES(PKG_DIRECTFB QUIET directfb)
-
-  SET(DIRECTFB_DEFINITIONS ${PKG_DIRECTFB_CFLAGS})
-
-  FIND_PATH(DIRECTFB_INCLUDE_DIR  NAMES directfb.h HINTS ${PKG_DIRECTFB_INCLUDE_DIRS})
-
-  FIND_LIBRARY(DIRECTFB_LIBRARIES NAMES directfb   HINTS ${PKG_DIRECTFB_LIBRARY_DIRS})
-
-  include(FindPackageHandleStandardArgs)
-
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(DIRECTFB DEFAULT_MSG DIRECTFB_LIBRARIES DIRECTFB_INCLUDE_DIR)
-
-  MARK_AS_ADVANCED(DIRECTFB_INCLUDE_DIR DIRECTFB_LIBRARIES)
-ENDIF ()

diff --git a/cmake/FindPCIAccess.cmake b/cmake/FindPCIAccess.cmake
deleted file mode 100644 (file)
index 65f7d5c..0000000
--- a/cmake/FindPCIAccess.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# - FindPCIAccess
-#
-# Copyright 2015 Valve Corporation
-
-find_package(PkgConfig)
-
-pkg_check_modules(PC_PCIACCESS QUIET pciaccess)
-
-find_path(PCIACCESS_INCLUDE_DIR NAMES pciaccess.h
-    HINTS
-    ${PC_PCIACCESS_INCLUDEDIR}
-    ${PC_PCIACCESS_INCLUDE_DIRS}
-    )
-
-find_library(PCIACCESS_LIBRARY NAMES pciaccess
-    HINTS
-    ${PC_PCIACCESS_LIBDIR}
-    ${PC_PCIACCESS_LIBRARY_DIRS}
-    )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PCIAccess DEFAULT_MSG
-    PCIACCESS_INCLUDE_DIR PCIACCESS_LIBRARY)
-
-mark_as_advanced(PCIACCESS_INCLUDE_DIR PCIACCESS_LIBRARY)
-
-set(PCIACCESS_INCLUDE_DIRS ${PCIACCESS_INCLUDE_DIR})
-set(PCIACCESS_LIBRARIES ${PCIACCESS_LIBRARY})

diff --git a/cmake/FindPthreadStubs.cmake b/cmake/FindPthreadStubs.cmake
deleted file mode 100644 (file)
index 063bbe5..0000000
--- a/cmake/FindPthreadStubs.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# - FindPthreadStubs
-#
-# Copyright (C) 2015 Valve Corporation
-
-find_package(PkgConfig)
-
-pkg_check_modules(PC_PTHREADSTUBS QUIET pthread-stubs)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PthreadStubs DEFAULT_MSG
-    PC_PTHREADSTUBS_FOUND)
-
-set(PTHREADSTUBS_INCLUDE_DIRS "")
-set(PTHREADSTUBS_LIBRARIES "")

diff --git a/cmake/FindUDev.cmake b/cmake/FindUDev.cmake
deleted file mode 100644 (file)
index e3d1699..0000000
--- a/cmake/FindUDev.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# - FindUDev
-#
-# Copyright (C) 2015 Valve Corporation
-
-find_package(PkgConfig)
-
-pkg_check_modules(PC_LIBUDEV QUIET libudev)
-
-find_path(UDEV_INCLUDE_DIR NAMES libudev.h
-    HINTS
-    ${PC_LIBUDEV_INCLUDEDIR}
-    ${PC_LIBUDEV_INCLUDE_DIRS}
-    )
-
-find_library(UDEV_LIBRARY NAMES udev
-    HINTS
-    ${PC_LIBUDEV_LIBDIR}
-    ${PC_LIBUDEV_LIBRARY_DIRS}
-    )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(UDev DEFAULT_MSG
-    UDEV_INCLUDE_DIR UDEV_LIBRARY)
-
-mark_as_advanced(UDEV_INCLUDE_DIR UDEV_LIBRARY)
-
-set(UDEV_INCLUDE_DIRS ${UDEV_INCLUDE_DIR})
-set(UDEV_LIBRARIES ${UDEV_LIBRARY})

diff --git a/cmake/FindValgrind.cmake b/cmake/FindValgrind.cmake
deleted file mode 100644 (file)
index 5c1fb56..0000000
--- a/cmake/FindValgrind.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-# - FindValgrind
-#
-# Copyright (C) 2015 Valve Corporation
-
-find_package(PkgConfig)
-
-pkg_check_modules(PC_VALGRIND QUIET valgrind)
-
-find_path(VALGRIND_INCLUDE_DIR NAMES valgrind.h memcheck.h
-    HINTS
-    ${PC_VALGRIND_INCLUDEDIR}
-    ${PC_VALGRIND_INCLUDE_DIRS}
-    )
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Valgrind DEFAULT_MSG
-    VALGRIND_INCLUDE_DIR)
-
-mark_as_advanced(VALGRIND_INCLUDE_DIR)
-
-set(VALGRIND_INCLUDE_DIRS ${VALGRIND_INCLUDE_DIR})
-set(VALGRIND_LIBRARIES "")

diff --git a/cmake/FindX11_XCB.cmake b/cmake/FindX11_XCB.cmake
deleted file mode 100644 (file)
index 956bf89..0000000
--- a/cmake/FindX11_XCB.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# - Try to find libX11-xcb
-# Once done this will define
-#
-# X11_XCB_FOUND - system has libX11-xcb
-# X11_XCB_LIBRARIES - Link these to use libX11-xcb
-# X11_XCB_INCLUDE_DIR - the libX11-xcb include dir
-# X11_XCB_DEFINITIONS - compiler switches required for using libX11-xcb
-
-# Copyright (c) 2011 Fredrik Höglund <fredrik@kde.org>
-# Copyright (c) 2008 Helio Chissini de Castro, <helio@kde.org>
-# Copyright (c) 2007 Matthias Kretz, <kretz@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-IF (NOT WIN32)
-  # use pkg-config to get the directories and then use these values
-  # in the FIND_PATH() and FIND_LIBRARY() calls
-  FIND_PACKAGE(PkgConfig)
-  PKG_CHECK_MODULES(PKG_X11_XCB QUIET x11-xcb)
-
-  SET(X11_XCB_DEFINITIONS ${PKG_X11_XCB_CFLAGS})
-
-  FIND_PATH(X11_XCB_INCLUDE_DIR NAMES X11/Xlib-xcb.h HINTS ${PKG_X11_XCB_INCLUDE_DIRS})
-  FIND_LIBRARY(X11_XCB_LIBRARIES NAMES X11-xcb HINTS ${PKG_X11_XCB_LIBRARY_DIRS})
-
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(X11_XCB DEFAULT_MSG X11_XCB_LIBRARIES X11_XCB_INCLUDE_DIR)
-
-  MARK_AS_ADVANCED(X11_XCB_INCLUDE_DIR X11_XCB_LIBRARIES)
-ENDIF (NOT WIN32)
-

diff --git a/cmake/FindXCB.cmake b/cmake/FindXCB.cmake
deleted file mode 100644 (file)
index 91127c7..0000000
--- a/cmake/FindXCB.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-# - FindXCB
-#
-# Copyright (C) 2015 Valve Corporation
-
-find_package(PkgConfig)
-
-if(NOT XCB_FIND_COMPONENTS)
-    set(XCB_FIND_COMPONENTS xcb)
-endif()
-
-include(FindPackageHandleStandardArgs)
-set(XCB_FOUND true)
-set(XCB_INCLUDE_DIRS "")
-set(XCB_LIBRARIES "")
-foreach(comp ${XCB_FIND_COMPONENTS})
-    # component name
-    string(TOUPPER ${comp} compname)
-    string(REPLACE "-" "_" compname ${compname})
-    # header name
-    string(REPLACE "xcb-" "" headername xcb/${comp}.h)
-    # library name
-    set(libname ${comp})
-
-    pkg_check_modules(PC_${comp} QUIET ${comp})
-
-    find_path(${compname}_INCLUDE_DIR NAMES ${headername}
-        HINTS
-        ${PC_${comp}_INCLUDEDIR}
-        ${PC_${comp}_INCLUDE_DIRS}
-        )
-
-    find_library(${compname}_LIBRARY NAMES ${libname}
-        HINTS
-        ${PC_${comp}_LIBDIR}
-        ${PC_${comp}_LIBRARY_DIRS}
-        )
-
-    set(FPHSA_NAME_MISMATCHED TRUE)
-    find_package_handle_standard_args(${comp}
-        FOUND_VAR ${comp}_FOUND
-        REQUIRED_VARS ${compname}_INCLUDE_DIR ${compname}_LIBRARY)
-    unset(FPHSA_NAME_MISMATCHED)
-
-    mark_as_advanced(${compname}_INCLUDE_DIR ${compname}_LIBRARY)
-
-    list(APPEND XCB_INCLUDE_DIRS ${${compname}_INCLUDE_DIR})
-    list(APPEND XCB_LIBRARIES ${${compname}_LIBRARY})
-
-    if(NOT ${comp}_FOUND)
-        set(XCB_FOUND false)
-    endif()
-endforeach()
-
-list(REMOVE_DUPLICATES XCB_INCLUDE_DIRS)