summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-04-06 15:57:14 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-04-06 15:57:14 -0400
commit09dd619612c4ff6cb8e4db991f156679f60fac06 (patch)
treedd2bb1c3da43b8f3d96b93ae07c64ca50ba02c6b /indra
parent82572bd3a9bb0901928248488a5e7fc8adba8247 (diff)
parent9dd00329791192f931155042a44f6c7181bacd37 (diff)
merge
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/CMakeLists.txt14
1 files changed, 0 insertions, 14 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 73b4d41895..4439018456 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1455,20 +1455,6 @@ set(PACKAGE ON CACHE BOOL
"Add a package target that builds an installer package.")
if (WINDOWS)
- if (INCREMENTAL_LINK)
- set_target_properties(${VIEWER_BINARY_NAME}
- PROPERTIES
- LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCREMENTAL /INCLUDE:__tcmalloc"
- LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
- LINK_FLAGS_RELEASE ${release_flags}
- )
- set_target_properties(${VIEWER_BINARY_NAME}
- PROPERTIES
- LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /INCLUDE:__tcmalloc"
- LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
- )
- endif(INCREMENTAL_LINK)
-
if(USE_PRECOMPILED_HEADERS)
set_target_properties(
${VIEWER_BINARY_NAME}