diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-14 19:38:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-14 19:38:04 (GMT) |
| commit | adf62a98f3460899337b00eb9553b86baf691806 (patch) | |
| tree | f5aaf7e2ef8695900f6da31a4f1b96655270f220 /Source | |
| parent | 75844666ac03a95c6546cafb54bce8827e1b664a (diff) | |
| parent | a765c491adc47c05ce0da933c9cb8aae84f5e530 (diff) | |
| download | CMake-adf62a98f3460899337b00eb9553b86baf691806.zip CMake-adf62a98f3460899337b00eb9553b86baf691806.tar.gz CMake-adf62a98f3460899337b00eb9553b86baf691806.tar.bz2 | |
Merge topic 'imported-target-dependencies'
a765c49 Honor custom command dependencies on imported targets (#10395)
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) { |