From 786b291d9c6b784c7ce6ceef0e38a4ec76ea14db Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 6 Apr 2022 16:32:52 +0200
Subject: Move CMake files to modernized cmake syntax, step 1. Change projects
 to cmake targetsto get rid of havig to hardcore include directories and link
 libraries in consumer projects.

---
 indra/media_plugins/gstreamer010/CMakeLists.txt | 30 ++-----------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

(limited to 'indra/media_plugins/gstreamer010/CMakeLists.txt')

diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt
index 571eb57b24..c66b5d0d2e 100644
--- a/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ b/indra/media_plugins/gstreamer010/CMakeLists.txt
@@ -16,20 +16,6 @@ include(OpenGL)
 
 include(GStreamer010Plugin)
 
-include_directories(
-    ${LLPLUGIN_INCLUDE_DIRS}
-    ${MEDIA_PLUGIN_BASE_INCLUDE_DIRS}
-    ${LLCOMMON_INCLUDE_DIRS}
-    ${LLMATH_INCLUDE_DIRS}
-    ${LLIMAGE_INCLUDE_DIRS}
-    ${LLRENDER_INCLUDE_DIRS}
-    ${LLWINDOW_INCLUDE_DIRS}
-    ${GSTREAMER010_INCLUDE_DIRS}
-    ${GSTREAMER010_PLUGINS_BASE_INCLUDE_DIRS}
-)
-include_directories(SYSTEM
-    ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
-    )
 
 ### media_plugin_gstreamer010
 
@@ -59,17 +45,5 @@ add_library(media_plugin_gstreamer010
     )
 
 target_link_libraries(media_plugin_gstreamer010
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-  ${PLUGIN_API_WINDOWS_LIBRARIES}
-  ${GSTREAMER010_LIBRARIES}
-)
-
-add_dependencies(media_plugin_gstreamer010
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
-
-
+        media_plugin_base
+  )
-- 
cgit v1.2.3


From defdbaf40d7a2621d36df8efa07157f71e91baa5 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Mon, 18 Apr 2022 03:12:19 +0200
Subject: Fixup for Linux media plugins. - Remove VLC - Remove missing cmake
 includes (that got deleted in earlier changes) from gstreamer plugin.

---
 indra/media_plugins/gstreamer010/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/media_plugins/gstreamer010/CMakeLists.txt')

diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt
index c66b5d0d2e..3b5debc585 100644
--- a/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ b/indra/media_plugins/gstreamer010/CMakeLists.txt
@@ -5,18 +5,14 @@ project(media_plugin_gstreamer010)
 include(00-Common)
 include(LLCommon)
 include(LLImage)
-include(LLPlugin)
 include(LLMath)
-include(LLRender)
 include(LLWindow)
 include(Linking)
 include(PluginAPI)
-include(MediaPluginBase)
 include(OpenGL)
 
 include(GStreamer010Plugin)
 
-
 ### media_plugin_gstreamer010
 
 if(NOT ADDRESS_SIZE EQUAL 32)
-- 
cgit v1.2.3


From 2b151e0aefd54671e1be504269f10318d303dccb Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Mon, 18 Apr 2022 18:11:43 +0200
Subject: Round one to support conan for 3P packages, this allows to build the
 viewer on Linux again.

---
 indra/media_plugins/gstreamer010/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/media_plugins/gstreamer010/CMakeLists.txt')

diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt
index 3b5debc585..38fc8201bf 100644
--- a/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ b/indra/media_plugins/gstreamer010/CMakeLists.txt
@@ -42,4 +42,5 @@ add_library(media_plugin_gstreamer010
 
 target_link_libraries(media_plugin_gstreamer010
         media_plugin_base
+        ll::gstreamer
   )
-- 
cgit v1.2.3