diff options
author | Brad King <brad.king@kitware.com> | 2010-12-14 19:38:48 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-14 19:38:48 (GMT) |
commit | f7036a1603fadcb500a5522cc397cd3b884e6e21 (patch) | |
tree | 81dc9efef56f5f0818512f723170f170fc539d7a /Source/cmVisualStudio10TargetGenerator.cxx | |
parent | 8e7f0488b47458775a162ed031b8635e043978ad (diff) | |
parent | ced1d5eccd4ae08a6431a5c163be3dd52ca9d59a (diff) | |
download | CMake-f7036a1603fadcb500a5522cc397cd3b884e6e21.zip CMake-f7036a1603fadcb500a5522cc397cd3b884e6e21.tar.gz CMake-f7036a1603fadcb500a5522cc397cd3b884e6e21.tar.bz2 |
Merge topic 'custom-command-depend'
ced1d5e Skip file-level dependencies on custom targets (#11332)
e30a775 Improve signature of cmLocalGenerator::GetRealDependency
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 8e55a0f..f78aeec 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -395,10 +395,12 @@ cmVisualStudio10TargetGenerator::WriteCustomRule(cmSourceFile* source, d != command.GetDepends().end(); ++d) { - std::string dep = this->LocalGenerator-> - GetRealDependency(d->c_str(), i->c_str()); - this->ConvertToWindowsSlash(dep); - (*this->BuildFileStream ) << ";" << dep; + std::string dep; + if(this->LocalGenerator->GetRealDependency(d->c_str(), i->c_str(), dep)) + { + this->ConvertToWindowsSlash(dep); + (*this->BuildFileStream ) << ";" << dep; + } } (*this->BuildFileStream ) << ";%(AdditionalInputs)</AdditionalInputs>\n"; this->WritePlatformConfigTag("Outputs", i->c_str(), 3); |