From c8eae77636ec874f4117ae09288e0872269f5976 Mon Sep 17 00:00:00 2001 From: Kyle McKay Date: Thu, 10 Jul 2008 02:16:54 +0000 Subject: Check the actual version of the compiler we're going to use to compile the sources to determine which options need to be added rather than the version of some other compiler on the system. --- indra/cmake/00-Common.cmake | 4 ++-- indra/llaudio/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 6ffc054de2..d404150bfd 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -105,9 +105,9 @@ if (LINUX) # treat as errors due to -Werror. Quiet the most offensive and # widespread of them. - if (${GXX_VERSION} MATCHES "4.3") + if (${CXX_VERSION} MATCHES "4.3") add_definitions(-Wno-deprecated -Wno-parentheses) - endif (${GXX_VERSION} MATCHES "4.3") + endif (${CXX_VERSION} MATCHES "4.3") # End of hacks. diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 1d51145d6e..b662023348 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -52,10 +52,10 @@ if (FMOD) ) if (LINUX) - if (${GXX_VERSION} MATCHES "4.[23]") + if (${CXX_VERSION} MATCHES "4.[23]") set_source_files_properties(audioengine_fmod.cpp COMPILE_FLAGS -Wno-error=write-strings) - endif (${GXX_VERSION} MATCHES "4.[23]") + endif (${CXX_VERSION} MATCHES "4.[23]") endif (LINUX) endif (FMOD) -- cgit v1.2.3