Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CMake] Remove add_dependency entries for items listed in target_link_libraries. Superfluous. (Alchemy sync)

Browse Source 
Fixes Linux build errors.
This commit is contained in:
Router Gray
2019-12-20 17:28:16 -06:00
parent c68e00730e
commit cdc35b3c32
8 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llplugin/CMakeLists.txt
View File

@@ -7,6 +7,7 @@ include(LLCommon)
include(LLMath) include(LLMath)
include(LLMessage) include(LLMessage)
include(LLRender) include(LLRender)
include(Boost)
include_directories( include_directories(
${LLCOMMON_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS}

7
indra/llplugin/slplugin/CMakeLists.txt
View File

@@ -1,7 +1,6 @@
project(SLPlugin) project(SLPlugin)
include(00-Common) include(00-Common)
include(Linking)
include(LLCommon) include(LLCommon)
include(LLPlugin) include(LLPlugin)
include(Linking) include(Linking)
@@ -72,12 +71,6 @@ target_link_libraries(SLPlugin
${PTHREAD_LIBRARY} ${PTHREAD_LIBRARY}
) )
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 ${CARBON_LIBRARY} ${COCOA_LIBRARY}) target_link_libraries(SLPlugin ${CARBON_LIBRARY} ${COCOA_LIBRARY})

2
indra/plugins/CMakeLists.txt
View File

@@ -1,5 +1,7 @@
# -*- cmake -*- # -*- cmake -*-
include(Variables)
add_subdirectory(base_basic) add_subdirectory(base_basic)
add_subdirectory(base_media) add_subdirectory(base_media)
add_subdirectory(filepicker) add_subdirectory(filepicker)

11
indra/plugins/cef/CMakeLists.txt
View File

@@ -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)
@@ -14,6 +15,7 @@ include(PluginAPI)
include(MediaPluginBase) include(MediaPluginBase)
include(OpenGL) include(OpenGL)
include(PulseAudio) include(PulseAudio)
include(UI)
include(CEFPlugin) include(CEFPlugin)
@@ -46,11 +48,10 @@ 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})
# Select which VolumeCatcher implementation to use # Select which VolumeCatcher implementation to use
if (LINUX) if (LINUX)
if (PULSEAUDIO_FOUND) if (PULSEAUDIO_FOUND)
@@ -83,12 +84,6 @@ add_library(media_plugin_cef
${media_plugin_cef_SOURCE_FILES} ${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) set_target_properties(media_plugin_cef PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
target_link_libraries(media_plugin_cef target_link_libraries(media_plugin_cef

6
indra/plugins/example_basic/CMakeLists.txt
View File

@@ -34,12 +34,6 @@ target_link_libraries(basic_plugin_example
${BASIC_PLUGIN_BASE_LIBRARIES} ${BASIC_PLUGIN_BASE_LIBRARIES}
) )
add_dependencies(basic_plugin_example
${LLPLUGIN_LIBRARIES}
${LLCOMMON_LIBRARIES}
${BASIC_PLUGIN_BASE_LIBRARIES}
)
if (WINDOWS) if (WINDOWS)
set_target_properties( set_target_properties(
basic_plugin_example basic_plugin_example

6
indra/plugins/example_media/CMakeLists.txt
View File

@@ -47,12 +47,6 @@ target_link_libraries(media_plugin_example
${PLUGIN_API_WINDOWS_LIBRARIES} ${PLUGIN_API_WINDOWS_LIBRARIES}
) )
add_dependencies(media_plugin_example
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
if (WINDOWS) if (WINDOWS)
set_target_properties( set_target_properties(
media_plugin_example media_plugin_example

6
indra/plugins/filepicker/CMakeLists.txt
View File

@@ -74,12 +74,6 @@ target_link_libraries(basic_plugin_filepicker
${OSX_FILE_LIBRARIES} ${OSX_FILE_LIBRARIES}
) )
add_dependencies(basic_plugin_filepicker
${LLPLUGIN_LIBRARIES}
${LLCOMMON_LIBRARIES}
${BASIC_PLUGIN_BASE_LIBRARIES}
)
if (WINDOWS) if (WINDOWS)
set_target_properties( set_target_properties(
basic_plugin_filepicker basic_plugin_filepicker

7
indra/plugins/gstreamer010/CMakeLists.txt
View File

@@ -13,6 +13,7 @@ include(Linking)
include(PluginAPI) include(PluginAPI)
include(MediaPluginBase) include(MediaPluginBase)
include(FindOpenGL) include(FindOpenGL)
include(Boost)
include(GStreamer010Plugin) include(GStreamer010Plugin)
@@ -55,9 +56,3 @@ target_link_libraries(media_plugin_gstreamer010
${GSTREAMER010_LIBRARIES} ${GSTREAMER010_LIBRARIES}
) )
add_dependencies(media_plugin_gstreamer010
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)