diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-09-25 19:23:24 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-09-25 19:23:24 -0700 |
| commit | 17f9fd5f9653077b6059b34147a447310a30daec (patch) | |
| tree | 982329539eea03fa0e80b4107b566f584182ca24 /indra/media_plugins | |
| parent | ec52e19dd16908acd72b78720880391a74ee8886 (diff) | |
Changes force no crt manifest linking in windows plugin files.
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/quicktime/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/CMakeLists.txt | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/indra/media_plugins/quicktime/CMakeLists.txt b/indra/media_plugins/quicktime/CMakeLists.txt index db11c9ae21..f0b8f0d167 100644 --- a/indra/media_plugins/quicktime/CMakeLists.txt +++ b/indra/media_plugins/quicktime/CMakeLists.txt @@ -56,6 +56,14 @@ add_dependencies(media_plugin_quicktime ${LLCOMMON_LIBRARIES} ) +if (WINDOWS) + set_target_properties( + media_plugin_quicktime + PROPERTIES + LINK_FLAGS "/MANIFEST:NO" + ) +endif (WINDOWS) + if (QUICKTIME) add_definitions(-DLL_QUICKTIME_ENABLED=1) 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( |