From cdc35b3c32be757669a0ceb7abc871ca7042ef98 Mon Sep 17 00:00:00 2001
From: Router Gray <routergray@gmail.com>
Date: Fri, 20 Dec 2019 17:28:16 -0600
Subject: [PATCH] [CMake] Remove add_dependency entries for items listed in
 target_link_libraries.  Superfluous. (Alchemy sync)

Fixes Linux build errors.
---
 indra/llplugin/CMakeLists.txt              |  1 +
 indra/llplugin/slplugin/CMakeLists.txt     |  7 -------
 indra/plugins/CMakeLists.txt               |  2 ++
 indra/plugins/cef/CMakeLists.txt           | 11 +++--------
 indra/plugins/example_basic/CMakeLists.txt |  6 ------
 indra/plugins/example_media/CMakeLists.txt |  6 ------
 indra/plugins/filepicker/CMakeLists.txt    |  6 ------
 indra/plugins/gstreamer010/CMakeLists.txt  |  7 +------
 8 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index e06405049..7ec2f5c5f 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -7,6 +7,7 @@ include(LLCommon)
 include(LLMath)
 include(LLMessage)
 include(LLRender)
+include(Boost)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 7f460eca3..f8ab56916 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -1,7 +1,6 @@
 project(SLPlugin)
 
 include(00-Common)
-include(Linking)
 include(LLCommon)
 include(LLPlugin)
 include(Linking)
@@ -72,12 +71,6 @@ target_link_libraries(SLPlugin
   ${PTHREAD_LIBRARY}
 )
 
-add_dependencies(SLPlugin
-  ${LLPLUGIN_LIBRARIES}
-  ${LLMESSAGE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
-
 if (DARWIN)
   # Mac version needs to link against Carbon
   target_link_libraries(SLPlugin ${CARBON_LIBRARY} ${COCOA_LIBRARY})
diff --git a/indra/plugins/CMakeLists.txt b/indra/plugins/CMakeLists.txt
index 441eb4dcf..aa19da9d2 100644
--- a/indra/plugins/CMakeLists.txt
+++ b/indra/plugins/CMakeLists.txt
@@ -1,5 +1,7 @@
 # -*- cmake -*-
 
+include(Variables)
+
 add_subdirectory(base_basic)
 add_subdirectory(base_media)
 add_subdirectory(filepicker)
diff --git a/indra/plugins/cef/CMakeLists.txt b/indra/plugins/cef/CMakeLists.txt
index 641535ede..8c369fe0e 100644
--- a/indra/plugins/cef/CMakeLists.txt
+++ b/indra/plugins/cef/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 project(media_plugin_cef)
 
+include(Boost)
 include(00-Common)
 include(LLCommon)
 include(LLImage)
@@ -14,6 +15,7 @@ include(PluginAPI)
 include(MediaPluginBase)
 include(OpenGL)
 include(PulseAudio)
+include(UI)
 
 include(CEFPlugin)
 
@@ -46,11 +48,10 @@ set(media_plugin_cef_HEADER_FILES
 set (media_plugin_cef_LINK_LIBRARIES
   ${LLPLUGIN_LIBRARIES}
   ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
   ${CEF_PLUGIN_LIBRARIES}
+  ${LLCOMMON_LIBRARIES}
   ${PLUGIN_API_WINDOWS_LIBRARIES})
 
-
 # Select which VolumeCatcher implementation to use
 if (LINUX)
   if (PULSEAUDIO_FOUND)
@@ -83,12 +84,6 @@ add_library(media_plugin_cef
     ${media_plugin_cef_SOURCE_FILES}
 )
 
-add_dependencies(media_plugin_cef
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
-
 set_target_properties(media_plugin_cef PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 
 target_link_libraries(media_plugin_cef
diff --git a/indra/plugins/example_basic/CMakeLists.txt b/indra/plugins/example_basic/CMakeLists.txt
index 1a19e8d01..c4a9a2779 100644
--- a/indra/plugins/example_basic/CMakeLists.txt
+++ b/indra/plugins/example_basic/CMakeLists.txt
@@ -34,12 +34,6 @@ target_link_libraries(basic_plugin_example
   ${BASIC_PLUGIN_BASE_LIBRARIES}
 )
 
-add_dependencies(basic_plugin_example
-  ${LLPLUGIN_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-  ${BASIC_PLUGIN_BASE_LIBRARIES}
-)
-
 if (WINDOWS)
   set_target_properties(
     basic_plugin_example
diff --git a/indra/plugins/example_media/CMakeLists.txt b/indra/plugins/example_media/CMakeLists.txt
index c3202521d..9b3499387 100644
--- a/indra/plugins/example_media/CMakeLists.txt
+++ b/indra/plugins/example_media/CMakeLists.txt
@@ -47,12 +47,6 @@ target_link_libraries(media_plugin_example
   ${PLUGIN_API_WINDOWS_LIBRARIES}
 )
 
-add_dependencies(media_plugin_example
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
-
 if (WINDOWS)
   set_target_properties(
     media_plugin_example
diff --git a/indra/plugins/filepicker/CMakeLists.txt b/indra/plugins/filepicker/CMakeLists.txt
index 2f154ff7d..0b07ded9a 100644
--- a/indra/plugins/filepicker/CMakeLists.txt
+++ b/indra/plugins/filepicker/CMakeLists.txt
@@ -74,12 +74,6 @@ target_link_libraries(basic_plugin_filepicker
   ${OSX_FILE_LIBRARIES}
 )
 
-add_dependencies(basic_plugin_filepicker
-  ${LLPLUGIN_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-  ${BASIC_PLUGIN_BASE_LIBRARIES}
-)
-
 if (WINDOWS)
   set_target_properties(
     basic_plugin_filepicker
diff --git a/indra/plugins/gstreamer010/CMakeLists.txt b/indra/plugins/gstreamer010/CMakeLists.txt
index 05b432b3d..a108e09c3 100644
--- a/indra/plugins/gstreamer010/CMakeLists.txt
+++ b/indra/plugins/gstreamer010/CMakeLists.txt
@@ -13,6 +13,7 @@ include(Linking)
 include(PluginAPI)
 include(MediaPluginBase)
 include(FindOpenGL)
+include(Boost)
 
 include(GStreamer010Plugin)
 
@@ -55,9 +56,3 @@ target_link_libraries(media_plugin_gstreamer010
   ${GSTREAMER010_LIBRARIES}
 )
 
-add_dependencies(media_plugin_gstreamer010
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
-