Skip to content
Snippets Groups Projects
Commit 28921896 authored by Rider Linden's avatar Rider Linden
Browse files

OPEN-312: Removed add_dependency entries for items listed in target_link_libraries. Superfluous.

parent f51a2407
No related branches found
No related tags found
No related merge requests found
...@@ -11,6 +11,7 @@ include(LLMessage) ...@@ -11,6 +11,7 @@ include(LLMessage)
include(LLRender) include(LLRender)
include(LLXML) include(LLXML)
include(LLWindow) include(LLWindow)
include(Boost)
include_directories( include_directories(
${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS}
......
...@@ -69,12 +69,6 @@ target_link_libraries(SLPlugin ...@@ -69,12 +69,6 @@ target_link_libraries(SLPlugin
${PLUGIN_API_WINDOWS_LIBRARIES} ${PLUGIN_API_WINDOWS_LIBRARIES}
) )
add_dependencies(SLPlugin
${LLPLUGIN_LIBRARIES}
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
if (DARWIN) if (DARWIN)
# Mac version needs to link against Carbon # Mac version needs to link against Carbon
target_link_libraries(SLPlugin ${COCOA_LIBRARY}) target_link_libraries(SLPlugin ${COCOA_LIBRARY})
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
project(media_plugin_cef) project(media_plugin_cef)
include(Boost)
include(00-Common) include(00-Common)
include(LLCommon) include(LLCommon)
include(LLImage) include(LLImage)
...@@ -52,8 +53,8 @@ set(media_plugin_cef_HEADER_FILES ...@@ -52,8 +53,8 @@ set(media_plugin_cef_HEADER_FILES
set (media_plugin_cef_LINK_LIBRARIES set (media_plugin_cef_LINK_LIBRARIES
${LLPLUGIN_LIBRARIES} ${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
${CEF_PLUGIN_LIBRARIES} ${CEF_PLUGIN_LIBRARIES}
${LLCOMMON_LIBRARIES}
${PLUGIN_API_WINDOWS_LIBRARIES}) ${PLUGIN_API_WINDOWS_LIBRARIES})
...@@ -84,11 +85,9 @@ add_library(media_plugin_cef ...@@ -84,11 +85,9 @@ add_library(media_plugin_cef
${media_plugin_cef_SOURCE_FILES} ${media_plugin_cef_SOURCE_FILES}
) )
add_dependencies(media_plugin_cef #add_dependencies(media_plugin_cef
${LLPLUGIN_LIBRARIES} # ${MEDIA_PLUGIN_BASE_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES} #)
${LLCOMMON_LIBRARIES}
)
target_link_libraries(media_plugin_cef target_link_libraries(media_plugin_cef
${media_plugin_cef_LINK_LIBRARIES} ${media_plugin_cef_LINK_LIBRARIES}
......
...@@ -14,6 +14,7 @@ include(PluginAPI) ...@@ -14,6 +14,7 @@ include(PluginAPI)
include(MediaPluginBase) include(MediaPluginBase)
include(OpenGL) include(OpenGL)
include(QuickTimePlugin) include(QuickTimePlugin)
include(Boost)
include_directories( include_directories(
${LLPLUGIN_INCLUDE_DIRS} ${LLPLUGIN_INCLUDE_DIRS}
...@@ -53,12 +54,6 @@ target_link_libraries(media_plugin_quicktime ...@@ -53,12 +54,6 @@ target_link_libraries(media_plugin_quicktime
${PLUGIN_API_WINDOWS_LIBRARIES} ${PLUGIN_API_WINDOWS_LIBRARIES}
) )
add_dependencies(media_plugin_quicktime
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
if (WINDOWS) if (WINDOWS)
set_target_properties( set_target_properties(
media_plugin_quicktime media_plugin_quicktime
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment