diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index b159092592bac2022512dfaa82b3ffa793225c44..1f578eec5fd90c3a571ef6c3bbb25125f5a82630 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -119,14 +119,14 @@ if (LINUX)
   endif (${GXX_VERSION} STREQUAL ${CXX_VERSION})
 
   # Let's actually get a numerical version of gxx's version
-  STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION ${CXX_VERSION})
+  STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION_NUMBER ${CXX_VERSION})
 
-  # gcc 4.3 and above don't like the LL boost and also 
+  # gcc 4.3 and above don't like the LL boost and also
   # cause warnings due to our use of deprecated headers
-  if(${CXX_VERSION} GREATER 429)
+  if(${CXX_VERSION_NUMBER} GREATER 429)
     add_definitions(-Wno-parentheses)
     set(CMAKE_CXX_FLAGS "-Wno-deprecated ${CMAKE_CXX_FLAGS}")
-  endif (${CXX_VERSION} GREATER 429)
+  endif (${CXX_VERSION_NUMBER} GREATER 429)
 
   # End of hacks.
 
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 5c49d325bf19593223f5ee8c363f574da1a6703f..bfa2c34c12808666a64ccfe8523c4b2f8535c630 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -58,11 +58,11 @@ if (FMOD)
          )
 
     if (LINUX)
-      if (${CXX_VERSION} MATCHES "4.[23]")
+      if (${CXX_VERSION_NUMBER} GREATER 419)
         set_source_files_properties(llaudioengine_fmod.cpp
                                     llstreamingaudio_fmod.cpp
                                     COMPILE_FLAGS -Wno-write-strings)
-      endif (${CXX_VERSION} MATCHES "4.[23]")
+      endif (${CXX_VERSION_NUMBER} GREATER 419)
     endif (LINUX)
 endif (FMOD)