diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-18 12:50:31 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-18 13:29:17 (GMT) |
| commit | 5bb4248a807029053156dbf4a3cdba4427766306 (patch) | |
| tree | 90439f898a63d61351f1fb5b72346382f272ce82 /Source/cmIncludeCommand.cxx | |
| parent | fc7ab8874b0e5c2c010fb73718ae8702b8853ca0 (diff) | |
| download | CMake-5bb4248a807029053156dbf4a3cdba4427766306.zip CMake-5bb4248a807029053156dbf4a3cdba4427766306.tar.gz CMake-5bb4248a807029053156dbf4a3cdba4427766306.tar.bz2 | |
cmMakefile: Remove fullPath parameter from ReadListFile.
There is no reason for this to be a responsibility of
ReadListFile. Additionally, the only user of it already computes
it itself.
Diffstat (limited to 'Source/cmIncludeCommand.cxx')
| -rw-r--r-- | Source/cmIncludeCommand.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index c15d46e..0c2e73a 100644 --- a/Source/cmIncludeCommand.cxx +++ b/Source/cmIncludeCommand.cxx @@ -130,17 +130,15 @@ bool cmIncludeCommand gg->GenerateImportFile(fname_abs); } - std::string fullFilePath; bool readit = this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(), - fname.c_str(), &fullFilePath, - noPolicyScope); + fname.c_str(), noPolicyScope); // add the location of the included file if a result variable was given if (!resultVarName.empty()) { this->Makefile->AddDefinition(resultVarName, - readit?fullFilePath.c_str():"NOTFOUND"); + readit?fname_abs.c_str():"NOTFOUND"); } if(!optional && !readit && !cmSystemTools::GetFatalErrorOccured()) |