From 41983b7f27805e6bcfe73cc4d13d803f6c6475d5 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Tue, 3 Jul 2012 04:45:53 +0000 Subject: [PATCH 1/2] A bit of cleanup and fixes --- indra/CMakeLists.txt | 2 +- indra/cmake/00-Common.cmake | 32 ++++++++++++-------------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 8ba3b5367..e16652a6c 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -30,7 +30,7 @@ include(BuildVersion) include(UnixInstall) -set (GCC_DISABLE_FATAL_WARNINGS TRUE) +set (DISABLE_FATAL_WARNINGS TRUE) if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE ReleaseSSE2 CACHE STRING diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2bd5a9c30..ebf532661 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -231,20 +231,8 @@ if (LINUX) add_definitions( -DCC_CLANG -D_FORTIFY_SOURCE=2 - -Wno-tautological-compare - -Wno-char-subscripts - -Wno-gnu - -Wno-logical-op-parentheses - -Wno-parentheses-equality - -Wno-unused-function - -Wno-unused-value - -Wno-unused-variable ) - if(NOT DISABLE_FATAL_WARNINGS) - add_definitions(-Werror) - endif(NOT DISABLE_FATAL_WARNINGS) - if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) @@ -291,17 +279,21 @@ endif (DARWIN) if (LINUX OR DARWIN) - set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") - + if(${CMAKE_C_COMPILER} MATCHES "gcc*") + set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") + set(UNIX_CXX_WARNINGS "${GCC_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 -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable") + set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}") + endif() + if (NOT DISABLE_FATAL_WARNINGS) - set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") + set(UNIX_WARNINGS "${UNIX_WARNINGS} -Werror") endif (NOT DISABLE_FATAL_WARNINGS) - set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") - - set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") - + set(CMAKE_C_FLAGS "${UNIX_WARNINGS} ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${UNIX_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") if (WORD_SIZE EQUAL 32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") From fc3436a8d1409e561b3690293ebb7a4bd4a4b869 Mon Sep 17 00:00:00 2001 From: Drake Arconis Date: Tue, 3 Jul 2012 04:48:30 +0000 Subject: [PATCH 2/2] *grumble* --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index ebf532661..58f8acf90 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -281,7 +281,7 @@ endif (DARWIN) if (LINUX OR DARWIN) if(${CMAKE_C_COMPILER} MATCHES "gcc*") set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") - set(UNIX_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") + 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 -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable")