diff options
author | Brad King <brad.king@kitware.com> | 2010-12-08 22:30:02 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2010-12-08 22:30:02 (GMT) |
commit | 53ea8b32045ce4c8045b904407e7e57d8d9fd4ab (patch) | |
tree | 344b33a014ac72ae0e6d70dd0739063fd1a9b254 /Source | |
parent | 1a29ccaf9a2604ad405035a4a6f51413f74a1145 (diff) | |
parent | a765c491adc47c05ce0da933c9cb8aae84f5e530 (diff) | |
download | CMake-53ea8b32045ce4c8045b904407e7e57d8d9fd4ab.zip CMake-53ea8b32045ce4c8045b904407e7e57d8d9fd4ab.tar.gz CMake-53ea8b32045ce4c8045b904407e7e57d8d9fd4ab.tar.bz2 |
Merge branch 'imported-target-dependencies' into custom-command-refactor
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmTarget.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ca61b1f..c82c11e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1357,8 +1357,8 @@ bool cmTargetTraceDependencies::IsUtility(std::string const& dep) util = cmSystemTools::GetFilenameWithoutLastExtension(util); } - // Check for a non-imported target with this name. - if(cmTarget* t = this->GlobalGenerator->FindTarget(0, util.c_str())) + // Check for a target with this name. + if(cmTarget* t = this->Makefile->FindTargetToUse(util.c_str())) { // If we find the target and the dep was given as a full path, // then make sure it was not a full path to something else, and @@ -1406,8 +1406,8 @@ cmTargetTraceDependencies cit != cc.GetCommandLines().end(); ++cit) { std::string const& command = *cit->begin(); - // Look for a non-imported target with this name. - if(cmTarget* t = this->GlobalGenerator->FindTarget(0, command.c_str())) + // Check for a target with this name. + if(cmTarget* t = this->Makefile->FindTargetToUse(command.c_str())) { if(t->GetType() == cmTarget::EXECUTABLE) { |