diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-06-15 14:57:16 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-06-15 14:57:16 +0100 |
commit | 0b523e402720493cd19a2fa08f8cffceea01eadf (patch) | |
tree | dc5137535761f87729932ed1de2ec33273b43b32 /indra/media_plugins | |
parent | d5ddb91a6809540cdb407cd48eff32b2c595d5db (diff) | |
parent | fce2653f6b5e8ca3509d13e3449b1fdd2f5ff826 (diff) |
Merge
Diffstat (limited to 'indra/media_plugins')
-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 3b73e04786..9f0ff654fc 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_NUMBER} MATCHES "4[23].") +if (${CXX_VERSION_NUMBER} MATCHES "4[23456789].") # Work around a bad interaction between broken gstreamer headers and - # g++ 4.3's increased strictness. + # g++ >= 4.2's increased strictness. set_source_files_properties(llmediaimplgstreamervidplug.cpp PROPERTIES COMPILE_FLAGS -Wno-write-strings) -endif (${CXX_VERSION_NUMBER} MATCHES "4[23].") +endif (${CXX_VERSION_NUMBER} MATCHES "4[23456789].") add_library(media_plugin_gstreamer010 SHARED |