kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix_incremental_vs2010' 

cddcad5 Fix incremental linking for VS2010 with nmake or make.
This commit is contained in:
Brad King 2010-12-14 14:38:27 -05:00 committed by CMake Topic Stage
parent b3f2d19ba7 cddcad5102
commit 5bea0917ef
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Platform/Windows-cl.cmake
View File

@ -212,6 +212,8 @@ SET (CMAKE_EXE_LINKER_FLAGS_INIT
SET( MSVC_INCREMENTAL_YES_FLAG "") SET( MSVC_INCREMENTAL_YES_FLAG "")
IF(NOT MSVC_INCREMENTAL_DEFAULT) IF(NOT MSVC_INCREMENTAL_DEFAULT)
SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES")
ELSE()
SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL" )
ENDIF() ENDIF()
IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE)

4
Source/cmake.cxx
View File

@ -3815,6 +3815,10 @@ int cmake::VisualStudioLink(std::vector<std::string>& args, int type)
{ {
hasIncremental = true; hasIncremental = true;
} }
if(cmSystemTools::Strucmp(i->c_str(), "/INCREMENTAL") == 0)
{
hasIncremental = true;
}
if(cmSystemTools::Strucmp(i->c_str(), "/MANIFEST:NO") == 0) if(cmSystemTools::Strucmp(i->c_str(), "/MANIFEST:NO") == 0)
{ {
hasManifest = false; hasManifest = false;