diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 09:05:04 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 09:05:04 +0000 |
| commit | 65025999d163c346ce79e8db6686b3d95b495b28 (patch) | |
| tree | 8099bde3442f698445bd283006e7167b9318ba2c /indra/media_plugins/webkit/CMakeLists.txt | |
| parent | 197c78fa4bf372d09b315b1bad3cf6649627eb48 (diff) | |
| parent | 456bbdfa2f3471896f6981e70a9daa56dae51d18 (diff) | |
more mergyness from viewer2 trunk.
Diffstat (limited to 'indra/media_plugins/webkit/CMakeLists.txt')
| -rw-r--r-- | indra/media_plugins/webkit/CMakeLists.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 5bccd589d8..4512c22b5d 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -9,6 +9,7 @@ include(LLPlugin) include(LLMath) include(LLRender) include(LLWindow) +include(UI) include(Linking) include(PluginAPI) include(MediaPluginBase) @@ -38,7 +39,7 @@ add_library(media_plugin_webkit ${media_plugin_webkit_SOURCE_FILES} ) -target_link_libraries(media_plugin_webkit +set(media_plugin_webkit_LINK_LIBRARIES ${LLPLUGIN_LIBRARIES} ${MEDIA_PLUGIN_BASE_LIBRARIES} ${LLCOMMON_LIBRARIES} @@ -46,6 +47,14 @@ target_link_libraries(media_plugin_webkit ${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} @@ -79,4 +88,5 @@ if (DARWIN) DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ) -endif (DARWIN)
\ No newline at end of file +endif (DARWIN) + |