diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-02-18 18:33:43 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-02-18 18:33:43 -0800 |
| commit | 66ecfbb1067d796a5d7228172061c681edb2b337 (patch) | |
| tree | f1b34a75c1770dba789f44b6f77a920b1355c2d9 /indra/newview/CMakeLists.txt | |
| parent | 69855f9d34cce116ceda1a4e5c914547d68f0cff (diff) | |
| parent | 2f6073bdb532c22efd808e064505c6b9d164268f (diff) | |
Merge.
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index abba6f134d..db029f9de7 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1433,19 +1433,13 @@ set(PACKAGE ON CACHE BOOL "Add a package target that builds an installer package.") if (WINDOWS) - if(MSVC71) - set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES") - else(MSVC71) - set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map") - endif(MSVC71) - set_target_properties(${VIEWER_BINARY_NAME} PROPERTIES # *TODO -reenable this once we get server usage sorted out #LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\"" LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" - LINK_FLAGS_RELEASE ${release_flags} + LINK_FLAGS_RELEASE "" ) if(USE_PRECOMPILED_HEADERS) set_target_properties( |