[CMake] Remove add_dependency entries for items listed in target_link_libraries. Superfluous. (Alchemy sync)
Fixes Linux build errors.
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
# -*- cmake -*-
|
||||
|
||||
include(Variables)
|
||||
|
||||
add_subdirectory(base_basic)
|
||||
add_subdirectory(base_media)
|
||||
add_subdirectory(filepicker)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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}
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user