diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-14 19:38:27 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-14 19:38:27 (GMT) |
| commit | 5bea0917ef53ccb3eb5cca40b3900668161cf5e7 (patch) | |
| tree | f553f81cdfe98e4a1e87d9b18bd19119f1f933e2 /Source | |
| parent | b3f2d19ba763401f7c940d9c9f289d5d74422fe1 (diff) | |
| parent | cddcad51020d42bbc321f45507a4649b1842aba4 (diff) | |
| download | CMake-5bea0917ef53ccb3eb5cca40b3900668161cf5e7.zip CMake-5bea0917ef53ccb3eb5cca40b3900668161cf5e7.tar.gz CMake-5bea0917ef53ccb3eb5cca40b3900668161cf5e7.tar.bz2 | |
Merge topic 'fix_incremental_vs2010'
cddcad5 Fix incremental linking for VS2010 with nmake or make.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmake.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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; |