Browse Source

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.
Bill Hoffman 15 years ago
parent
commit
cddcad5102
2 changed files with 6 additions and 0 deletions
  1. 2 0
      Modules/Platform/Windows-cl.cmake
  2. 4 0
      Source/cmake.cxx

+ 2 - 0
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)

+ 4 - 0
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;