From 6fc0c9dc2a1c0877b0d3d5e1b7ecd279290f9080 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 4 Jan 2016 13:58:49 -0500 Subject: possible linux build fix --- indra/cmake/00-Common.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/cmake') 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 -- cgit v1.2.3