diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-24 09:31:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-27 13:18:31 (GMT) |
| commit | c7b79aa16adc1117e62bf146c64f97c992ec2e2e (patch) | |
| tree | 66fae23d85d71ff99d8ac1d131696707fcec34b1 /Source/CPack/cmCPackGenerator.cxx | |
| parent | 01e1cd5c1fc5e2684ec69d4916dd31ed23746055 (diff) | |
| download | CMake-c7b79aa16adc1117e62bf146c64f97c992ec2e2e.zip CMake-c7b79aa16adc1117e62bf146c64f97c992ec2e2e.tar.gz CMake-c7b79aa16adc1117e62bf146c64f97c992ec2e2e.tar.bz2 | |
cmGlobalGenerator: Require a cmake instance in ctor.
It is required anyway, so this makes it explicit.
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 41614ca..bf4df60 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -715,8 +715,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cm.SetHomeOutputDirectory(""); cm.AddCMakePaths(); cm.SetProgressCallback(cmCPackGeneratorProgress, this); - cmGlobalGenerator gg; - gg.SetCMakeInstance(&cm); + cmGlobalGenerator gg(&cm); cmsys::auto_ptr<cmLocalGenerator> lg(gg.MakeLocalGenerator()); cmMakefile *mf = lg->GetMakefile(); std::string realInstallDirectory = tempInstallDirectory; |