Use EGL find module from ECM

lirios · Aug 18, 2023 · 4edaf1b · 4edaf1b
1 parent 6e1eb44
commit 4edaf1b
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 40 deletions.
diff --git a/cmake/FindEGL.cmake b/cmake/FindEGL.cmake
diff --git a/features.cmake b/features.cmake
@@ -2,9 +2,6 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
-## Find EGL:
-find_package(EGL QUIET)
-
 ## Find Vulkan:
 find_package(Vulkan QUIET)
 
@@ -83,7 +80,9 @@ set(LIRI_FEATURE_aurora_xkbcommon "$<IF:${FEATURE_aurora_xkbcommon},1,0>")
 # brcm
 option(FEATURE_aurora_brcm "Raspberry Pi" ON)
 if(FEATURE_aurora_brcm)
-    if(NOT TARGET PkgConfig::EGL)
+    find_package(EGL QUIET)
+
+    if(NOT TARGET EGL::EGL)
         message(WARNING "You need EGL for Aurora::Brcm")
     endif()
     set(FEATURE_aurora_brcm OFF)
@@ -94,7 +93,7 @@ if(FEATURE_aurora_brcm)
         LABEL
             "Broadcom EGL (Raspberry Pi)"
         LIBRARIES
-            PkgConfig::EGL
+            EGL::EGL
         CODE "
     #include <EGL/egl.h>
     #include <bcm_host.h>
@@ -126,9 +125,11 @@ set(LIRI_FEATURE_aurora_compositor_quick "$<IF:${FEATURE_aurora_compositor_quick
 # dmabuf-client-buffer
 option(FEATURE_aurora_dmabuf_client_buffer "Linux dma-buf client buffer integration" ON)
 if(FEATURE_aurora_dmabuf_client_buffer)
+    find_package(EGL QUIET)
     find_package(Qt${QT_MAJOR_VERSION}EglSupport QUIET)
-    if(NOT TARGET PkgConfig::EGL OR NOT TARGET PkgConfig::Libdrm OR NOT TARGET Qt::OpenGL OR NOT TARGET Qt${QT_MAJOR_VERSION}EglSupport::Qt${QT_MAJOR_VERSION}EglSupport)
-        if(NOT TARGET PkgConfig::EGL)
+
+    if(NOT TARGET EGL::EGL OR NOT TARGET PkgConfig::Libdrm OR NOT TARGET Qt::OpenGL OR NOT TARGET Qt${QT_MAJOR_VERSION}EglSupport::Qt${QT_MAJOR_VERSION}EglSupport)
+        if(NOT TARGET EGL::EGL)
             message(WARNING "You need EGL for Aurora::DmabufClientBuffer")
         endif()
         if(NOT TARGET PkgConfig::Libdrm)
@@ -149,7 +150,7 @@ if(FEATURE_aurora_dmabuf_client_buffer)
         LABEL
             "Linux client dma-buf buffer sharing"
         LIBRARIES
-            PkgConfig::EGL
+            EGL::EGL
             PkgConfig::Libdrm
         CODE "
     #include <EGL/egl.h>
@@ -180,8 +181,10 @@ set(LIRI_FEATURE_aurora_dmabuf_client_buffer "$<IF:${FEATURE_aurora_dmabuf_clien
 # dmabuf-server-buffer
 option(FEATURE_aurora_dmabuf_server_buffer "Linux dma-buf server buffer integration" ON)
 if(FEATURE_aurora_dmabuf_server_buffer)
-    if(NOT TARGET PkgConfig::EGL OR NOT TARGET PkgConfig::Libdrm OR NOT TARGET Qt::OpenGL)
-        if(NOT TARGET PkgConfig::EGL)
+    find_package(EGL QUIET)
+
+    if(NOT TARGET EGL::EGL OR NOT TARGET PkgConfig::Libdrm OR NOT TARGET Qt::OpenGL)
+        if(NOT TARGET EGL::EGL)
             message(WARNING "You need EGL for Aurora::DmabufServerBuffer")
         endif()
         if(NOT TARGET PkgConfig::Libdrm)
@@ -199,7 +202,7 @@ if(FEATURE_aurora_dmabuf_server_buffer)
         LABEL
             "Linux dma-buf Buffer Sharing"
         LIBRARIES
-            PkgConfig::EGL
+            EGL::EGL
             PkgConfig::Libdrm
         CODE "
     #include <EGL/egl.h>
@@ -232,10 +235,10 @@ set(LIRI_FEATURE_aurora_drm_atomic "$<IF:${FEATURE_aurora_drm_atomic},1,0>")
 # drm-egl-server-buffer
 option(FEATURE_aurora_drm_egl_server_buffer "DRM EGL" ON)
 if(FEATURE_aurora_drm_egl_server_buffer)
-    if(NOT TARGET PkgConfig::EGL)
-        if(NOT TARGET PkgConfig::EGL)
-            message(WARNING "You need EGL for Aurora::DrmEglServerBuffer")
-        endif()
+    find_package(EGL QUIET)
+
+    if(NOT TARGET EGL::EGL)
+        message(WARNING "You need EGL for Aurora::DrmEglServerBuffer")
         set(FEATURE_aurora_drm_egl_server_buffer OFF)
     endif()
 endif()
@@ -245,7 +248,7 @@ if(FEATURE_aurora_drm_egl_server_buffer)
         LABEL
             "DRM EGL Server"
         LIBRARIES
-            PkgConfig::EGL
+            EGL::EGL
         CODE "
     #include <EGL/egl.h>
     #include <EGL/eglext.h>
@@ -271,10 +274,12 @@ set(LIRI_FEATURE_aurora_drm_egl_server_buffer "$<IF:${FEATURE_aurora_drm_egl_ser
 # wayland-egl
 option(FEATURE_aurora_wayland_egl "Wayland EGL" ON)
 if(FEATURE_aurora_wayland_egl)
+    find_package(EGL QUIET)
     find_package(Wayland "${WAYLAND_MIN_VERSION}" COMPONENTS Egl QUIET)
     find_package(Qt${QT_MAJOR_VERSION}EglSupport QUIET)
-    if(NOT TARGET PkgConfig::EGL OR NOT TARGET Wayland::Egl OR NOT TARGET Qt::OpenGL OR NOT TARGET Qt${QT_MAJOR_VERSION}EglSupport::Qt${QT_MAJOR_VERSION}EglSupport)
-        if(NOT TARGET PkgConfig::EGL)
+
+    if(NOT TARGET EGL::EGL OR NOT TARGET Wayland::Egl OR NOT TARGET Qt::OpenGL OR NOT TARGET Qt${QT_MAJOR_VERSION}EglSupport::Qt${QT_MAJOR_VERSION}EglSupport)
+        if(NOT TARGET EGL::EGL)
             message(WARNING "You need EGL for Aurora::WaylandEgl")
         endif()
         if(NOT TARGET Wayland::Egl)
@@ -295,8 +300,10 @@ set(LIRI_FEATURE_aurora_wayland_egl "$<IF:${FEATURE_aurora_wayland_egl},1,0>")
 # libhybris-egl-server-buffer
 option(FEATURE_aurora_libhybris_egl_server_buffer "libhybris EGL" ON)
 if(FEATURE_aurora_libhybris_egl_server_buffer)
-    if(NOT TARGET PkgConfig::EGL OR NOT TARGET Qt::OpenGL)
-        if(NOT TARGET PkgConfig::EGL)
+    find_package(EGL QUIET)
+
+    if(NOT TARGET EGL::EGL OR NOT TARGET Qt::OpenGL)
+        if(NOT TARGET EGL::EGL)
             message(WARNING "You need EGL for Aurora::LibhybrisEgl")
         endif()
         if(NOT TARGET Qt::OpenGL)
@@ -311,7 +318,7 @@ if(FEATURE_aurora_libhybris_egl_server_buffer)
         LABEL
             "libhybris EGL Server"
         LIBRARIES
-            PkgConfig::EGL
+            EGL::EGL
         CODE "
     #include <EGL/egl.h>
     #include <EGL/eglext.h>
@@ -338,7 +345,9 @@ set(LIRI_FEATURE_aurora_libhybris_egl_server_buffer "$<IF:${FEATURE_aurora_libhy
 # qpa
 option(FEATURE_aurora_qpa "Qt platform plugin for Wayland compositors" ON)
 if(FEATURE_aurora_qpa)
-    if(NOT TARGET PkgConfig::EGL)
+    find_package(EGL QUIET)
+
+    if(NOT TARGET EGL::EGL)
         message(WARNING "You need EGL for Aurora::QPA")
 	set(FEATURE_aurora_qpa OFF)
     endif()

diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt
@@ -14,7 +14,7 @@ liri_add_plugin(AuroraDmaBufServerBufferIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/compositor/dmabuf-server
     LIBRARIES
-        PkgConfig::EGL
+        EGL::EGL
         PkgConfig::Libdrm
         Wayland::Server
         Qt::CorePrivate

diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt
@@ -14,7 +14,7 @@ liri_add_plugin(AuroraDrmEglServerBufferIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/compositor/drm-egl-server
     LIBRARIES
-        PkgConfig::EGL
+        EGL::EGL
         Wayland::Server
         Qt::CorePrivate
         Qt::GuiPrivate

diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt
@@ -14,7 +14,7 @@ liri_add_plugin(AuroraLibHybrisEglServerBufferIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/compositor/libhybris-egl-server
     LIBRARIES
-        PkgConfig::EGL
+        EGL::EGL
         Wayland::Server
     PUBLIC_LIBRARIES
         Qt::CorePrivate

diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt
@@ -17,7 +17,7 @@ liri_add_plugin(AuroraDmabufClientBufferIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1
     LIBRARIES
-        PkgConfig::EGL
+        EGL::EGL
         PkgConfig::Libdrm
         Wayland::Server
         Qt::CorePrivate

diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
@@ -16,7 +16,7 @@ liri_add_plugin(AuroraWaylandEglClientBufferIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/compositor/wayland-egl
     LIBRARIES
-        PkgConfig::EGL
+        EGL::EGL
         Wayland::Egl
         Wayland::Server
         Qt5EglSupport::Qt5EglSupport

diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
@@ -17,7 +17,7 @@ liri_add_plugin(AuroraWaylandEglStreamClientBufferIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/compositor/wayland-eglstream-controller
     LIBRARIES
-        PkgConfig::EGL
+        EGL::EGL
         Wayland::Egl
         Wayland::Server
         Qt::CorePrivate

diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -72,7 +72,7 @@ liri_add_module(EglFSDeviceIntegration
         Liri::AuroraPlatformHeaders
         Liri::AuroraUdev
         Liri::AuroraLogind
-        PkgConfig::EGL
+        EGL::EGL
     EXPORT_IMPORT_CONDITION
         QT_BUILD_EGL_DEVICE_LIB
     NO_CMAKE

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt
@@ -26,7 +26,7 @@ liri_add_plugin(eglfs-kms-integration
         Liri::EglFSDeviceIntegrationPrivate
         Liri::EglFSKmsSupport
         Liri::EglFSKmsSupportPrivate
-        PkgConfig::EGL
+        EGL::EGL
 )
 
 liri_extend_target(eglfs-kms-integration CONDITION FEATURE_aurora_drm_atomic

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt
@@ -22,7 +22,7 @@ liri_add_plugin(eglfs-kms-egldevice-integration
         Liri::EglFSDeviceIntegrationPrivate
         Liri::EglFSKmsSupport
         Liri::EglFSKmsSupportPrivate
-        PkgConfig::EGL
+        EGL::EGL
 )
 
 liri_extend_target(eglfs-kms-egldevice-integration CONDITION FEATURE_aurora_drm_atomic

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
@@ -38,7 +38,7 @@ liri_add_module(EglFSKmsSupport
         Liri::AuroraKmsSupportPrivate
         PkgConfig::Libdrm
         PkgConfig::Gbm
-        PkgConfig::EGL
+        EGL::EGL
     NO_CMAKE
     NO_PKGCONFIG
 )