[cmake][modules] FindEGL cleanup and use core_target_link_libraries

7 files changed, 18 insertions, 21 deletions

diff --git a/cmake/modules/FindEGL.cmake b/cmake/modules/FindEGL.cmake
index 1a0ce39f7c..05d74c27e1 100644
--- a/cmake/modules/FindEGL.cmake
+++ b/cmake/modules/FindEGL.cmake
@@ -5,21 +5,19 @@
 #
 # This will define the following target:
 #
-#   EGL::EGL   - The EGL library
+#   ${APP_NAME_LC}::EGL   - The EGL library
 
-if(NOT TARGET EGL::EGL)
+if(NOT TARGET ${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME})
   find_package(PkgConfig)
   if(PKG_CONFIG_FOUND)
     pkg_check_modules(PC_EGL egl QUIET)
   endif()
 
   find_path(EGL_INCLUDE_DIR EGL/egl.h
-                            HINTS ${PC_EGL_INCLUDEDIR}
-                            NO_CACHE)
+                            HINTS ${PC_EGL_INCLUDEDIR})
 
   find_library(EGL_LIBRARY NAMES EGL egl
-                           HINTS ${PC_EGL_LIBDIR}
-                           NO_CACHE)
+                           HINTS ${PC_EGL_LIBDIR})
 
   set(EGL_VERSION ${PC_EGL_VERSION})
 
@@ -37,16 +35,15 @@ if(NOT TARGET EGL::EGL)
     check_include_files("EGL/egl.h;EGL/eglext.h;EGL/eglext_angle.h" HAVE_EGLEXTANGLE)
     unset(CMAKE_REQUIRED_INCLUDES)
 
-    add_library(EGL::EGL UNKNOWN IMPORTED)
-    set_target_properties(EGL::EGL PROPERTIES
-                                   IMPORTED_LOCATION "${EGL_LIBRARY}"
-                                   INTERFACE_INCLUDE_DIRECTORIES "${EGL_INCLUDE_DIR}"
-                                   INTERFACE_COMPILE_DEFINITIONS HAS_EGL=1)
+    add_library(${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME} UNKNOWN IMPORTED)
+    set_target_properties(${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME} PROPERTIES
+                                                                     IMPORTED_LOCATION "${EGL_LIBRARY}"
+                                                                     INTERFACE_INCLUDE_DIRECTORIES "${EGL_INCLUDE_DIR}"
+                                                                     INTERFACE_COMPILE_DEFINITIONS HAS_EGL)
 
     if(HAVE_EGLEXTANGLE)
-      set_property(TARGET EGL::EGL APPEND PROPERTY
-                                          INTERFACE_COMPILE_DEFINITIONS HAVE_EGLEXTANGLE=1)
+      set_property(TARGET ${APP_NAME_LC}::${CMAKE_FIND_PACKAGE_NAME} APPEND PROPERTY
+                                                                            INTERFACE_COMPILE_DEFINITIONS HAVE_EGLEXTANGLE)
     endif()
-    set_property(GLOBAL APPEND PROPERTY INTERNAL_DEPS_PROP EGL::EGL)
   endif()
 endif()
diff --git a/xbmc/cores/RetroPlayer/buffers/CMakeLists.txt b/xbmc/cores/RetroPlayer/buffers/CMakeLists.txt
index 91413f7527..ef66479c46 100644
--- a/xbmc/cores/RetroPlayer/buffers/CMakeLists.txt
+++ b/xbmc/cores/RetroPlayer/buffers/CMakeLists.txt
@@ -24,7 +24,7 @@ if(TARGET OpenGL::GL)
                       RenderBufferPoolOpenGL.h)
 endif()
 
-if(("gbm" IN_LIST CORE_PLATFORM_NAME_LC OR "wayland" IN_LIST CORE_PLATFORM_NAME_LC) AND TARGET EGL::EGL)
+if(("gbm" IN_LIST CORE_PLATFORM_NAME_LC OR "wayland" IN_LIST CORE_PLATFORM_NAME_LC) AND TARGET ${APP_NAME_LC}::EGL)
   list(APPEND SOURCES RenderBufferDMA.cpp
                       RenderBufferPoolDMA.cpp)
   list(APPEND HEADERS RenderBufferDMA.h
diff --git a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/CMakeLists.txt b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/CMakeLists.txt
index 4a2a65c7e2..5680b8ec9e 100644
--- a/xbmc/cores/RetroPlayer/rendering/VideoRenderers/CMakeLists.txt
+++ b/xbmc/cores/RetroPlayer/rendering/VideoRenderers/CMakeLists.txt
@@ -18,7 +18,7 @@ if(TARGET OpenGL::GL)
   list(APPEND HEADERS RPRendererOpenGL.h)
 endif()
 
-if(("gbm" IN_LIST CORE_PLATFORM_NAME_LC OR "wayland" IN_LIST CORE_PLATFORM_NAME_LC) AND TARGET EGL::EGL)
+if(("gbm" IN_LIST CORE_PLATFORM_NAME_LC OR "wayland" IN_LIST CORE_PLATFORM_NAME_LC) AND TARGET ${APP_NAME_LC}::EGL)
   list(APPEND SOURCES RPRendererDMA.cpp)
   list(APPEND HEADERS RPRendererDMA.h)
 endif()
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt
index 8598052b41..bd4d6333ee 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt
@@ -14,7 +14,7 @@ if(VAAPI_FOUND)
     list(APPEND SOURCES RendererVAAPIGLES.cpp)
     list(APPEND HEADERS RendererVAAPIGLES.h)
   endif()
-  if(TARGET EGL::EGL)
+  if(TARGET ${APP_NAME_LC}::EGL)
     list(APPEND SOURCES VaapiEGL.cpp)
     list(APPEND HEADERS VaapiEGL.h)
   endif()
diff --git a/xbmc/utils/CMakeLists.txt b/xbmc/utils/CMakeLists.txt
index 97ab349f0e..8d0e385b88 100644
--- a/xbmc/utils/CMakeLists.txt
+++ b/xbmc/utils/CMakeLists.txt
@@ -187,7 +187,7 @@ if(TARGET XSLT::XSLT)
   list(APPEND SOURCES XSLTUtils.cpp)
   list(APPEND HEADERS XSLTUtils.h)
 endif()
-if(TARGET EGL::EGL)
+if(TARGET ${APP_NAME_LC}::EGL)
   list(APPEND SOURCES EGLUtils.cpp
                       EGLFence.cpp)
   list(APPEND HEADERS EGLUtils.h
@@ -230,7 +230,7 @@ if("gbm" IN_LIST CORE_PLATFORM_NAME_LC OR "wayland" IN_LIST CORE_PLATFORM_NAME_L
     list(APPEND HEADERS GBMBufferObject.h)
   endif()
 
-  if(TARGET EGL::EGL)
+  if(TARGET ${APP_NAME_LC}::EGL)
     list(APPEND SOURCES EGLImage.cpp)
     list(APPEND HEADERS EGLImage.h)
   endif()
diff --git a/xbmc/windowing/linux/CMakeLists.txt b/xbmc/windowing/linux/CMakeLists.txt
index 6dde69783a..1917cd683b 100644
--- a/xbmc/windowing/linux/CMakeLists.txt
+++ b/xbmc/windowing/linux/CMakeLists.txt
@@ -6,7 +6,7 @@ if(TARGET ${APP_NAME_LC}::DBus)
   list(APPEND HEADERS OSScreenSaverFreedesktop.h)
 endif()
 
-if(TARGET EGL::EGL)
+if(TARGET ${APP_NAME_LC}::EGL)
   list(APPEND SOURCES WinSystemEGL.cpp)
   list(APPEND HEADERS WinSystemEGL.h)
 endif()
diff --git a/xbmc/windowing/wayland/CMakeLists.txt b/xbmc/windowing/wayland/CMakeLists.txt
index c406de112f..b1ff8a236f 100644
--- a/xbmc/windowing/wayland/CMakeLists.txt
+++ b/xbmc/windowing/wayland/CMakeLists.txt
@@ -49,7 +49,7 @@ set(HEADERS Connection.h
             WinSystemWayland.h
             XkbcommonKeymap.h)
 
-if(TARGET EGL::EGL)
+if(TARGET ${APP_NAME_LC}::EGL)
   list(APPEND SOURCES WinSystemWaylandEGLContext.cpp)
   list(APPEND HEADERS WinSystemWaylandEGLContext.h)
 endif()