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:26:12 (GMT) |
| commit | fc7ab8874b0e5c2c010fb73718ae8702b8853ca0 (patch) | |
| tree | 29fd855027a20cd599f89c01c55a9692e1a38f7c /Source | |
| parent | 1f1b62b0e2598554349dce14542a4c383f620ada (diff) | |
| download | CMake-fc7ab8874b0e5c2c010fb73718ae8702b8853ca0.zip CMake-fc7ab8874b0e5c2c010fb73718ae8702b8853ca0.tar.gz CMake-fc7ab8874b0e5c2c010fb73718ae8702b8853ca0.tar.bz2 | |
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.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 4f37041..a2edab5 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -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()) |