From 96d83800995ef5eac961d6f91fec9a5fd6f05836 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 23 Apr 2013 19:16:17 +0200 Subject: [PATCH] Remove -Wno-sign-compare and fix DISABLE_FATAL_WARNINGS Turn on sign-compare warnings and allow fatal warnings when using -DDISABLE_FATAL_WARNINGS:BOOL=OFF during configuration. The default is no -Werror. --- indra/CMakeLists.txt | 2 -- indra/cmake/00-Common.cmake | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index f80c1a15e..fc7b0a878 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -30,8 +30,6 @@ include(BuildVersion) include(UnixInstall) -set (DISABLE_FATAL_WARNINGS CACHE BOOL TRUE) - if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type. One of: Debug Release RelWithDebInfo" FORCE) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 5eb78b0b2..eced9783a 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -270,10 +270,10 @@ endif (DARWIN) if (LINUX OR DARWIN) if(${CMAKE_C_COMPILER} MATCHES "gcc*") - set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") + set(UNIX_WARNINGS "-Wall -Wno-trigraphs") set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") elseif(${CMAKE_C_COMPILER} MATCHES "clang*") - set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses -Wno-non-virtual-dtor ") + set(UNIX_WARNINGS "-Wall -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses -Wno-non-virtual-dtor") set(UNIX_WARNINGS "${UNIX_WARNINGS} -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable") set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}") elseif(${CMAKE_C_COMPILER} MATCHES "icc") @@ -281,8 +281,11 @@ if (LINUX OR DARWIN) set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}") endif() + # Use -DDISABLE_FATAL_WARNINGS:BOOL=FALSE during configuration to enable fatal warnings. + set(DISABLE_FATAL_WARNINGS TRUE CACHE BOOL "Set this to FALSE to enable fatal warnings.") if (NOT DISABLE_FATAL_WARNINGS) set(UNIX_WARNINGS "${UNIX_WARNINGS} -Werror") + set(UNIX_CXX_WARNINGS "${UNIX_CXX_WARNINGS} -Werror") endif (NOT DISABLE_FATAL_WARNINGS) set(CMAKE_C_FLAGS "${UNIX_WARNINGS} ${CMAKE_C_FLAGS}")