diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-12 11:28:07 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-12 11:28:07 -0700 |
| commit | e950425fe37507243d1d2bfa2405b6f2ab5be284 (patch) | |
| tree | d77315adaedec41692317c57cf5344a7c1ae3479 /indra/cmake | |
| parent | 45e46cf4c163a7af6544645b5216834d4598b85d (diff) | |
| parent | ab60c46a917366574fa7292b6e7142ece858bec5 (diff) | |
Merged lindenlab/viewer-cat into default
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 81296965c2..6bfd8c14d6 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -128,6 +128,13 @@ if (LINUX) # 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_NUMBER ${CXX_VERSION}) + # Hacks to work around gcc 4.1 TC build pool machines which can't process pragma warning disables + # This is pure rubbish; I wish there was another way. + # + if(${CXX_VERSION_NUMBER} LESS 420) + set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-uninitialized -Wno-unused-variable -Wno-unused-function ${CMAKE_CXX_FLAGS}") + endif (${CXX_VERSION_NUMBER} LESS 420) + # 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_NUMBER} GREATER 429) |