diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-20 13:22:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-20 13:22:20 (GMT) |
| commit | 9c609db98811f57c9fa086f17e6a8740b317a63b (patch) | |
| tree | 2848fcdc364e344f39200926e15355b70299bd7f /Source/cmMakefile.cxx | |
| parent | aa8f8777a4209400b355ca7de10dc25660a45647 (diff) | |
| parent | 19012b4652953ea8d8a470d1790419b1d8682850 (diff) | |
| download | CMake-9c609db98811f57c9fa086f17e6a8740b317a63b.zip CMake-9c609db98811f57c9fa086f17e6a8740b317a63b.tar.gz CMake-9c609db98811f57c9fa086f17e6a8740b317a63b.tar.bz2 | |
Merge topic 'minor_cleanups'
19012b46 cmMakefile: Fix style.
10e6f1e7 cmMakefile: Fix typo in comment.
c3a2f78b Makefiles: Remove duplicate code.
2e0611f9 cmGeneratorExpression: Remove unused include.
d83ef53a Rename local 'dir_max' variables to 'dir'
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ad9de60..93a06f0 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2079,7 +2079,7 @@ cmMakefile::LinearGetSourceFileWithOutput(const std::string& name) const // does this source file have a custom command? if ((*i)->GetCustomCommand()) { - // is the output of the custom command match the source files name + // Does the output of the custom command match the source file name? const std::vector<std::string>& outputs = (*i)->GetCustomCommand()->GetOutputs(); for(std::vector<std::string>::const_iterator o = outputs.begin(); @@ -2109,7 +2109,7 @@ cmSourceFile *cmMakefile::GetSourceFileWithOutput( // linear-time search for an output with a matching suffix. if(!cmSystemTools::FileIsFullPath(name.c_str())) { - return LinearGetSourceFileWithOutput(name); + return this->LinearGetSourceFileWithOutput(name); } // Otherwise we use an efficient lookup map. OutputToSourceMap::const_iterator o = this->OutputToSource.find(name); |