From c99904585be0cd6f6a239c3181fa3339a070ba14 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sat, 24 Apr 2010 14:50:33 +0100
Subject: [PATCH] EXT-7005 : Kill unhelpful 'Deprecated conversion from string
to char *' warnings from fmod_errors.h when building with GCC >=4.2 on Darwin
Apply -Wno-write-strings compile flag to llaudioengine_fmod.cpp and llstreamingaudio_fmod.cpp on Darwin as it was on Linux (Amen).
Removed unnecessary check for GCC >= 4.2 when applying this flag, as CXX_VERSION_NUMBER it used is only being generated in 00-Common.cmake on Linux at the moment and 4.0 understands -Wno-write-strings anyway.
---
indra/llaudio/CMakeLists.txt | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index bfa2c34c128..e869b9717c3 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -57,13 +57,11 @@ if (FMOD)
llstreamingaudio_fmod.h
)
- if (LINUX)
- if (${CXX_VERSION_NUMBER} GREATER 419)
- set_source_files_properties(llaudioengine_fmod.cpp
- llstreamingaudio_fmod.cpp
- COMPILE_FLAGS -Wno-write-strings)
- endif (${CXX_VERSION_NUMBER} GREATER 419)
- endif (LINUX)
+ if (LINUX OR DARWIN)
+ set_source_files_properties(llaudioengine_fmod.cpp
+ llstreamingaudio_fmod.cpp
+ COMPILE_FLAGS -Wno-write-strings)
+ endif (LINUX OR DARWIN)
endif (FMOD)
if (OPENAL)
--
GitLab