summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit/CMakeLists.txt
diff options
context:
space:
mode:
authorskolb <none@none>2009-10-14 10:10:46 -0700
committerskolb <none@none>2009-10-14 10:10:46 -0700
commit1b1550f284316b244a10a4a6604fedb5d6b18965 (patch)
tree2416742bb0fa10c646c8490c39c3442fa73f1924 /indra/media_plugins/webkit/CMakeLists.txt
parent1d63b145481021c5d0ed16bd0c10c320170d0cf5 (diff)
parentb5768a69b18936282cf55f0a1ecb72ba19849836 (diff)
Merge
Diffstat (limited to 'indra/media_plugins/webkit/CMakeLists.txt')
-rw-r--r--indra/media_plugins/webkit/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index d96477279d..5bccd589d8 100644
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -52,6 +52,14 @@ add_dependencies(media_plugin_webkit
${LLCOMMON_LIBRARIES}
)
+if (WINDOWS)
+ set_target_properties(
+ media_plugin_webkit
+ PROPERTIES
+ LINK_FLAGS "/MANIFEST:NO"
+ )
+endif (WINDOWS)
+
if (DARWIN)
# Don't prepend 'lib' to the executable name, and don't embed a full path in the library's install name
set_target_properties(