From cddcad51020d42bbc321f45507a4649b1842aba4 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Thu, 9 Dec 2010 13:32:48 -0500
Subject: 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.
---
 Modules/Platform/Windows-cl.cmake | 2 ++
 Source/cmake.cxx                  | 4 ++++
 2 files changed, 6 insertions(+)

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)
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index ddfdc24..1b49837 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -3815,6 +3815,10 @@ int cmake::VisualStudioLink(std::vector<std::string>& args, int type)
       {
       hasIncremental = true;
       }
+    if(cmSystemTools::Strucmp(i->c_str(), "/INCREMENTAL") == 0)
+      {
+      hasIncremental = true;
+      }
     if(cmSystemTools::Strucmp(i->c_str(), "/MANIFEST:NO") == 0)
       {
       hasManifest = false;
-- 
cgit v0.12