Compile flag "-Wno-non-virtual-dtor" is for C++, not C.

Fixes a warning when compiling Mac updater.

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 231239c..595d2c6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2009-11-28  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+        * Compile flag "-Wno-non-virtual-dtor" is for C++, not C.
+          Fixes a warning when compiling Mac updater.
+
+          modified:   linden/indra/cmake/00-Common.cmake
+
+
         * Downgraded Linux boost to 1.36.0.
 
           modified:   linden/install.xml
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index a443939..49fdb5b 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -189,13 +189,13 @@ endif (DARWIN)
 
 
 if (LINUX OR DARWIN)
-  set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-non-virtual-dtor")
+  set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
 
   if (NOT GCC_DISABLE_FATAL_WARNINGS)
     set(GCC_WARNINGS "${GCC_WARNINGS} -Werror")
   endif (NOT GCC_DISABLE_FATAL_WARNINGS)
 
-  set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder")
+  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}")