diff options
| author | callum_linden <none@none> | 2014-10-17 12:35:26 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-17 12:35:26 -0700 |
| commit | 5ab3a832d32c7bcef6827e0916e94246980b0234 (patch) | |
| tree | 3f627db04eab0aeb9ebef9193d4146bee2c94078 /indra | |
| parent | 01125b282658c2d0253edc2b4f348f6d71075558 (diff) | |
Update to build on Xcode 6.0: turn OFF warnings as errors for overloaded virtuals [-Wno-overloaded-virtual]
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/00-Common.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index a24bdf4bf5..008e27f061 100755 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -205,7 +205,17 @@ endif (DARWIN) if (LINUX OR DARWIN) + if (CMAKE_CXX_COMPILER MATCHES ".*clang") + set(CMAKE_COMPILER_IS_CLANGXX 1) + endif (CMAKE_CXX_COMPILER MATCHES ".*clang") + + if (CMAKE_COMPILER_IS_GNUCXX) set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") + elseif (CMAKE_COMPILER_IS_CLANGXX) + # These unused warnings really ought to be cleaned up over time + set(UNUSED_WARNINGS "-Wno-overloaded-virtual") + set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs ${UNUSED_WARNINGS}") + endif() if (NOT GCC_DISABLE_FATAL_WARNINGS) set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") |