From f0193202c5caa1d9b9f9ba28bc6a931092d71622 Mon Sep 17 00:00:00 2001
From: Martin Reddy <lynx@lindenlab.com>
Date: Fri, 16 Oct 2009 14:35:24 +0000
Subject: [PATCH] DEV-41410 SNOW-204: merging this snowglobe fix into
viewer-2.0.0-3. Provides more robust gcc version checking for suppressing
warnings.
---
doc/contributions.txt | 1 +
indra/cmake/00-Common.cmake | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 6b51e2649e..942ba0f0b9 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -497,6 +497,7 @@ Ringo Tuxing
CT-231
CT-321
Robin Cornelius
+ SNOW-204
VWR-2488
VWR-9557
VWR-11128
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index b168c08552..173e650961 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -118,14 +118,15 @@ if (LINUX)
endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
endif (${GXX_VERSION} STREQUAL ${CXX_VERSION})
- # GCC 4.3 introduces a pile of obnoxious new warnings, which we
- # treat as errors due to -Werror. Quiet the most offensive and
- # widespread of them.
+ # 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})
- if (${CXX_VERSION} MATCHES "4.3")
+ # 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)
add_definitions(-Wno-parentheses)
set(CMAKE_CXX_FLAGS "-Wno-deprecated ${CMAKE_CXX_FLAGS}")
- endif (${CXX_VERSION} MATCHES "4.3")
+ endif (${CXX_VERSION} GREATER 429)
# End of hacks.
--
GitLab