livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DEV-41410 SNOW-204: merging this snowglobe fix into viewer-2.0.0-3. 

Provides more robust gcc version checking for suppressing warnings.
master
Martin Reddy 2009-10-16 14:35:24 +00:00
parent 7aa859b7f4
commit f0193202c5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -497,6 +497,7 @@ Ringo Tuxing
CT-231
CT-321
Robin Cornelius
SNOW-204
VWR-2488
VWR-9557
VWR-11128

11
indra/cmake/00-Common.cmake
View File

@ -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.