summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit/CMakeLists.txt
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-20 10:52:53 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-20 10:52:53 -0700
commitafcccc3b36d96ababe61ca04dc6c9e02f4b20d81 (patch)
treef351783fb94e36ba6229bf4a9531eb4e42a4272f /indra/media_plugins/webkit/CMakeLists.txt
parent91fe3e7c790317420619aff1aae9ae14d38fa606 (diff)
parentaa75245a1aee3b64aeed31744e58fe96afa1ce7e (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(