diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 15:08:10 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 15:08:10 +0000 |
commit | c920a71240c2473f9bbc9f91a69e16d1c0808cbe (patch) | |
tree | b96e2eabb78685800ae6d1aac3ac851b19c61f17 /indra/media_plugins/webkit/CMakeLists.txt | |
parent | d181c3e41b7d8b52799e233db201e4da337c56fe (diff) | |
parent | b0791c3001f669a32abc4d4b40f4dc4f6f2bc912 (diff) |
merge
Diffstat (limited to 'indra/media_plugins/webkit/CMakeLists.txt')
-rw-r--r-- | indra/media_plugins/webkit/CMakeLists.txt | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 4512c22b5d..c4dd5fd79d 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -9,7 +9,6 @@ include(LLPlugin) include(LLMath) include(LLRender) include(LLWindow) -include(UI) include(Linking) include(PluginAPI) include(MediaPluginBase) @@ -39,7 +38,7 @@ add_library(media_plugin_webkit ${media_plugin_webkit_SOURCE_FILES} ) -set(media_plugin_webkit_LINK_LIBRARIES +target_link_libraries(media_plugin_webkit ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} ${LLCOMMON_LIBRARIES} @@ -47,14 +46,6 @@ set(media_plugin_webkit_LINK_LIBRARIES ${PLUGIN_API_WINDOWS_LIBRARIES} ) -if (LINUX) - list(APPEND media_plugin_webkit_LINK_LIBRARIES - ${UI_LIBRARIES} # for glib/GTK - ) -endif (LINUX) - -target_link_libraries(media_plugin_webkit ${media_plugin_webkit_LINK_LIBRARIES}) - add_dependencies(media_plugin_webkit ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} |