CPack: Read the config listfile in the normal way.
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:
parent
1f1b62b0e2
commit
fc7ab8874b
@ -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())
|
||||
|
Loading…
x
Reference in New Issue
Block a user