diff options
| author | Jacek Antonelli | 2009-09-27 16:32:32 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-27 16:32:32 -0500 |
| commit | 35e3870b5c9e38fdab96ca857a256be6d8ab024a (patch) | |
| tree | 02364fd85552dafbc2503e2c188b4c71e245e14f /linden/indra/cmake/00-Common.cmake | |
| parent | Re-enabled "allow first life" userauth stuff. (diff) | |
| parent | Changes to make the grid manager compile on Windows (diff) | |
| download | meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.zip meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.tar.gz meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.tar.bz2 meta-impy-35e3870b5c9e38fdab96ca857a256be6d8ab024a.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Diffstat (limited to 'linden/indra/cmake/00-Common.cmake')
| -rw-r--r-- | linden/indra/cmake/00-Common.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 2d691ad..e15e8a2 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
| @@ -33,7 +33,7 @@ if (WINDOWS) | |||
| 33 | CACHE STRING "C++ compiler release-with-debug options" FORCE) | 33 | CACHE STRING "C++ compiler release-with-debug options" FORCE) |
| 34 | if (MSVC80) | 34 | if (MSVC80) |
| 35 | set(CMAKE_CXX_FLAGS_RELEASE | 35 | set(CMAKE_CXX_FLAGS_RELEASE |
| 36 | "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /MT" | 36 | "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MT" |
| 37 | CACHE STRING "C++ compiler release options" FORCE) | 37 | CACHE STRING "C++ compiler release options" FORCE) |
| 38 | else (MSVC80) | 38 | else (MSVC80) |
| 39 | set(CMAKE_CXX_FLAGS_RELEASE | 39 | set(CMAKE_CXX_FLAGS_RELEASE |