diff options
| author | Jacek Antonelli | 2009-11-28 22:26:13 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-28 22:28:45 -0600 |
| commit | c817fd0fac9eac19ddc5505b29e4a1bfe35dbd47 (patch) | |
| tree | d270ed24b505cff906069720622fb400d8290daf /linden/indra/cmake | |
| parent | Downgraded Linux boost to 1.36.0. (diff) | |
| download | meta-impy-c817fd0fac9eac19ddc5505b29e4a1bfe35dbd47.zip meta-impy-c817fd0fac9eac19ddc5505b29e4a1bfe35dbd47.tar.gz meta-impy-c817fd0fac9eac19ddc5505b29e4a1bfe35dbd47.tar.bz2 meta-impy-c817fd0fac9eac19ddc5505b29e4a1bfe35dbd47.tar.xz | |
Compile flag "-Wno-non-virtual-dtor" is for C++, not C.
Fixes a warning when compiling Mac updater.
Diffstat (limited to 'linden/indra/cmake')
| -rw-r--r-- | linden/indra/cmake/00-Common.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 189 | 189 | ||
| 190 | 190 | ||
| 191 | if (LINUX OR DARWIN) | 191 | if (LINUX OR DARWIN) |
| 192 | set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-non-virtual-dtor") | 192 | set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs") |
| 193 | 193 | ||
| 194 | if (NOT GCC_DISABLE_FATAL_WARNINGS) | 194 | if (NOT GCC_DISABLE_FATAL_WARNINGS) |
| 195 | set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") | 195 | set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") |
| 196 | endif (NOT GCC_DISABLE_FATAL_WARNINGS) | 196 | endif (NOT GCC_DISABLE_FATAL_WARNINGS) |
| 197 | 197 | ||
| 198 | set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder") | 198 | set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor") |
| 199 | 199 | ||
| 200 | set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") | 200 | set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") |
| 201 | set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") | 201 | set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") |