diff options
| author | Brad King <brad.king@kitware.com> | 2011-01-27 19:39:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-01-27 19:39:55 (GMT) |
| commit | dd2f81491e6e17681dd18882a8ccfa01fa32a3f7 (patch) | |
| tree | 6b782de32aeb462333d70747f269b1725e723e00 /Source/cmake.cxx | |
| parent | 949d32c3067830a1376950fc78dbcde39bc378a8 (diff) | |
| parent | 7679f9fab099e729b61320927a9e0b8d03546f7f (diff) | |
| download | CMake-dd2f81491e6e17681dd18882a8ccfa01fa32a3f7.zip CMake-dd2f81491e6e17681dd18882a8ccfa01fa32a3f7.tar.gz CMake-dd2f81491e6e17681dd18882a8ccfa01fa32a3f7.tar.bz2 | |
Merge branch 'dev/add_test-working-directory' into dev/strict-mode
Conflicts:
Tests/CMakeLists.txt
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 0d1c4ef..bab0aaf 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -374,8 +374,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args) } std::string var, value; cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED; - if(cmCacheManager::ParseEntry(entry.c_str(), var, value, type) || - cmCacheManager::ParseEntry(entry.c_str(), var, value)) + if(cmCacheManager::ParseEntry(entry.c_str(), var, value, type)) { this->CacheManager->AddCacheEntry(var.c_str(), value.c_str(), "No help, variable specified on the command line.", type); @@ -3864,6 +3863,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; |