summaryrefslogtreecommitdiffstats
path: root/Modules/Platform
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2010-12-09 18:32:48 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2010-12-09 18:32:48 (GMT)
commitcddcad51020d42bbc321f45507a4649b1842aba4 (patch)
tree41f3186dcd9ab47b701c2102f0b916a071bd2855 /Modules/Platform
parentc300ef1c66eafcae3b4ef05f2ec27768feb1e280 (diff)
downloadCMake-cddcad51020d42bbc321f45507a4649b1842aba4.zip
CMake-cddcad51020d42bbc321f45507a4649b1842aba4.tar.gz
CMake-cddcad51020d42bbc321f45507a4649b1842aba4.tar.bz2
Fix incremental linking for VS2010 with nmake or make.
VS2010 deprecated /INCREMENTAL:YES. This change makes /INCREMENTAL the flag to use for incremental linking with VS2010.
Diffstat (limited to 'Modules/Platform')
-rw-r--r--Modules/Platform/Windows-cl.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake
index 7463c62..56582ff 100644
--- a/Modules/Platform/Windows-cl.cmake
+++ b/Modules/Platform/Windows-cl.cmake
@@ -212,6 +212,8 @@ SET (CMAKE_EXE_LINKER_FLAGS_INIT
SET( MSVC_INCREMENTAL_YES_FLAG "")
IF(NOT MSVC_INCREMENTAL_DEFAULT)
SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES")
+ELSE()
+ SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL" )
ENDIF()
IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)