diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-01-04 13:58:49 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-01-04 13:58:49 -0500 |
| commit | 6fc0c9dc2a1c0877b0d3d5e1b7ecd279290f9080 (patch) | |
| tree | dab4d1dced3be9a18d57082b5ae3d736fbc3f2a7 /indra | |
| parent | 7e3b32299992bdef8c7cbcab1347b9187b43eba3 (diff) | |
possible linux build fix
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/00-Common.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 20516303e2..bde1eb453e 100755 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -136,12 +136,14 @@ if (LINUX) # 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. # + set(CMAKE_CXX_FLAGS "-Wno-unused-variable -Wno-unused-function -Wno-unused-local-typedefs -Wno-maybe-uninitialized") + if(${CXX_VERSION_NUMBER} LESS 420) - set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-uninitialized -Wno-unused-variable -Wno-unused-function -Wno-unused-local-typedefs ${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-uninitialized ${CMAKE_CXX_FLAGS}") endif (${CXX_VERSION_NUMBER} LESS 420) if(${CXX_VERSION_NUMBER} GREATER 459) - set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unused-function -Wno-unused-local-typedefs ${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-unused-but-set-variable ${CMAKE_CXX_FLAGS}") endif (${CXX_VERSION_NUMBER} GREATER 459) # gcc 4.3 and above don't like the LL boost and also |