diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:58:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:58:23 +0000 |
| commit | 6f41747bc4d8afcb2b19ac02295575031bcf9021 (patch) | |
| tree | 1e83d8fcf7af6b9416b49bb46cb9e7cf15abffbc /indra/media_plugins/gstreamer010 | |
| parent | 57fca109cae3105b6bc1319e9886c16631bc7374 (diff) | |
Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587
* Dev: EXT-748 EXT-1447
* IM Cleanup
Diffstat (limited to 'indra/media_plugins/gstreamer010')
| -rw-r--r-- | indra/media_plugins/gstreamer010/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt index 5c0ce3ee17..a9f7938b41 100644 --- a/indra/media_plugins/gstreamer010/CMakeLists.txt +++ b/indra/media_plugins/gstreamer010/CMakeLists.txt @@ -42,12 +42,12 @@ set(media_plugin_gstreamer010_HEADER_FILES llmediaimplgstreamertriviallogging.h ) -if (${CXX_VERSION} MATCHES "4.[23]") +if (${CXX_VERSION} MATCHES "4[23].") # Work around a bad interaction between broken gstreamer headers and # g++ 4.3's increased strictness. set_source_files_properties(llmediaimplgstreamervidplug.cpp PROPERTIES - COMPILE_FLAGS -Wno-error=write-strings) -endif (${CXX_VERSION} MATCHES "4.[23]") + COMPILE_FLAGS -Wno-write-strings) +endif (${CXX_VERSION} MATCHES "4[23].") add_library(media_plugin_gstreamer010 SHARED |