kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPack: Read the config listfile in the normal way.

Browse Source 
This is a unique function call in CMake, and it was likely a
programming error when introduced.  All other similar calls to
ReadListFile use a null first paramter.

The effect of this patch is to no-longer define CMAKE_PARENT_LIST_FILE
to the config file itself while evaluating it.

The ReadListFile method also no longer hits a condition that it uses
CollapseFullPath on the input file.  However, as cpack does not
set the StartDirectory anyway, this has no effect. See bug 15522.
This commit is contained in:
Stephen Kelly 2015-04-18 14:50:31 +02:00
parent 1f1b62b0e2
commit fc7ab8874b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CPack/cmCPackGenerator.cxx
View File

@ -1163,7 +1163,7 @@ int cmCPackGenerator::Initialize(const std::string& name, cmMakefile* mf)
this->GetOption("CPACK_PROJECT_CONFIG_FILE");
if(config)
{
mf->ReadListFile(config);
mf->ReadListFile(0, config);
}
int result = this->InitializeInternal();
if (cmSystemTools::GetErrorOccuredFlag())