summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
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 /Source/cmake.cxx
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 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx4
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;