diff options
| author | palmer@sansome-guest-196.lindenlab.com <palmer@sansome-guest-196.lindenlab.com> | 2009-11-03 17:43:59 -0800 |
|---|---|---|
| committer | palmer@sansome-guest-196.lindenlab.com <palmer@sansome-guest-196.lindenlab.com> | 2009-11-03 17:43:59 -0800 |
| commit | c9664666358c5b3d8d79f31f5f0e3cb6528f1f8d (patch) | |
| tree | bd3ed7b502ea75a043ce478c414735231957e3e0 /indra | |
| parent | e77de2e955c56293b354ddc82363fc0063a2e410 (diff) | |
| parent | c3bb2669ce30681449f7fe68f0822878565c273f (diff) | |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/render-pipeline
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index e7afe0ecba..5c0e639947 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -208,7 +208,7 @@ if (LINUX OR DARWIN) set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") endif (NOT GCC_DISABLE_FATAL_WARNINGS) - set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") + set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor") set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") |